diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:49 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:49 +0100 |
| commit | 62ee96bd3b5e02173c0d9956c4f1e1a4de8f940d (patch) | |
| tree | 1c9d519fb35c8c599bb31c4ee836f3ac135d933d /drivers/Kconfig | |
| parent | 13408877f4c0d4b2784d3388dd4481369205e46a (diff) | |
| parent | ef06284cd947c4e90a54a62d2c106789c6eaebe8 (diff) | |
| download | barebox-62ee96bd3b5e02173c0d9956c4f1e1a4de8f940d.tar.gz barebox-62ee96bd3b5e02173c0d9956c4f1e1a4de8f940d.tar.xz | |
Merge branch 'for-next/mtd'
Conflicts:
arch/arm/configs/eukrea_cpuimx27_defconfig
drivers/mtd/core.c
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index dac22de98b..16ca5b99b0 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -5,7 +5,6 @@ source "drivers/serial/Kconfig" source "drivers/net/Kconfig" source "drivers/spi/Kconfig" source "drivers/i2c/Kconfig" -source "drivers/nor/Kconfig" source "drivers/mtd/Kconfig" source "drivers/ata/Kconfig" source "drivers/usb/Kconfig" |