diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/mtd/devices/Kconfig | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/mtd/devices/Kconfig')
| -rw-r--r-- | drivers/mtd/devices/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig index c222514bb70d..35081ce77fbd 100644 --- a/drivers/mtd/devices/Kconfig +++ b/drivers/mtd/devices/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # drivers/mtd/maps/Kconfig | ||
| 2 | |||
| 3 | menu "Self-contained MTD device drivers" | 1 | menu "Self-contained MTD device drivers" |
| 4 | depends on MTD!=n | 2 | depends on MTD!=n |
| 5 | 3 | ||
| @@ -308,4 +306,3 @@ config MTD_DOCPROBE_55AA | |||
| 308 | you have managed to wipe the first block. | 306 | you have managed to wipe the first block. |
| 309 | 307 | ||
| 310 | endmenu | 308 | endmenu |
| 311 | |||