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/lpddr/Kconfig | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/mtd/lpddr/Kconfig')
| -rw-r--r-- | drivers/mtd/lpddr/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mtd/lpddr/Kconfig b/drivers/mtd/lpddr/Kconfig index 5a401d8047ab..265f969817e3 100644 --- a/drivers/mtd/lpddr/Kconfig +++ b/drivers/mtd/lpddr/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # drivers/mtd/chips/Kconfig | ||
| 2 | |||
| 3 | menu "LPDDR flash memory drivers" | 1 | menu "LPDDR flash memory drivers" |
| 4 | depends on MTD!=n | 2 | depends on MTD!=n |
| 5 | 3 | ||
| @@ -20,4 +18,3 @@ config MTD_QINFO_PROBE | |||
| 20 | families of devices. This serves similar purpose of CFI on legacy | 18 | families of devices. This serves similar purpose of CFI on legacy |
| 21 | Flash products | 19 | Flash products |
| 22 | endmenu | 20 | endmenu |
| 23 | |||