aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/chips/Kconfig3
-rw-r--r--drivers/mtd/devices/Kconfig3
-rw-r--r--drivers/mtd/devices/slram.c2
-rw-r--r--drivers/mtd/lpddr/Kconfig3
-rw-r--r--drivers/mtd/maps/Kconfig8
-rw-r--r--drivers/mtd/nand/Kconfig2
-rw-r--r--drivers/mtd/nand/diskonchip.c2
-rw-r--r--drivers/mtd/nand/nand_ecc.c2
-rw-r--r--drivers/mtd/nand/s3c2410.c2
-rw-r--r--drivers/mtd/onenand/Kconfig4
-rw-r--r--drivers/mtd/ubi/Kconfig2
11 files changed, 7 insertions, 26 deletions
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index 9408099eec48..35c6a23b183b 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -1,5 +1,3 @@
1# drivers/mtd/chips/Kconfig
2
3menu "RAM/ROM/Flash chip drivers" 1menu "RAM/ROM/Flash chip drivers"
4 depends on MTD!=n 2 depends on MTD!=n
5 3
@@ -242,4 +240,3 @@ config MTD_XIP
242 then say N. 240 then say N.
243 241
244endmenu 242endmenu
245
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
3menu "Self-contained MTD device drivers" 1menu "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
310endmenu 308endmenu
311
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 3aa05cd18ea1..592016a0668f 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -18,7 +18,7 @@
18 to specify the offset instead of the absolute address 18 to specify the offset instead of the absolute address
19 19
20 NOTE: 20 NOTE:
21 With slram it's only possible to map a contigous memory region. Therfore 21 With slram it's only possible to map a contiguous memory region. Therefore
22 if there's a device mapped somewhere in the region specified slram will 22 if there's a device mapped somewhere in the region specified slram will
23 fail to load (see kernel log if modprobe fails). 23 fail to load (see kernel log if modprobe fails).
24 24
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
3menu "LPDDR flash memory drivers" 1menu "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
22endmenu 20endmenu
23
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 14be0755d7cd..847e214ade59 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -1,5 +1,3 @@
1# drivers/mtd/maps/Kconfig
2
3menu "Mapping drivers for chip access" 1menu "Mapping drivers for chip access"
4 depends on MTD!=n 2 depends on MTD!=n
5 3
@@ -389,9 +387,9 @@ config MTD_IXP2000
389 depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP2000 387 depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP2000
390 help 388 help
391 This enables MTD access to flash devices on platforms based 389 This enables MTD access to flash devices on platforms based
392 on Intel's IXP2000 family of network processors such as the 390 on Intel's IXP2000 family of network processors. If you have an
393 IXDP425 and Coyote. If you have an IXP2000 based board and 391 IXP2000 based board and would like to use the flash chips on it,
394 would like to use the flash chips on it, say 'Y'. 392 say 'Y'.
395 393
396config MTD_FORTUNET 394config MTD_FORTUNET
397 tristate "CFI Flash device mapped on the FortuNet board" 395 tristate "CFI Flash device mapped on the FortuNet board"
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 2fda0b615246..6264bf14494c 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -1,5 +1,3 @@
1# drivers/mtd/nand/Kconfig
2
3menuconfig MTD_NAND 1menuconfig MTD_NAND
4 tristate "NAND Device Support" 2 tristate "NAND Device Support"
5 depends on MTD 3 depends on MTD
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index e51c1ed7ac18..b126cf887476 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1056,7 +1056,7 @@ static struct nand_ecclayout doc200x_oobinfo = {
1056}; 1056};
1057 1057
1058/* Find the (I)NFTL Media Header, and optionally also the mirror media header. 1058/* Find the (I)NFTL Media Header, and optionally also the mirror media header.
1059 On sucessful return, buf will contain a copy of the media header for 1059 On successful return, buf will contain a copy of the media header for
1060 further processing. id is the string to scan for, and will presumably be 1060 further processing. id is the string to scan for, and will presumably be
1061 either "ANAND" or "BNAND". If findmirror=1, also look for the mirror media 1061 either "ANAND" or "BNAND". If findmirror=1, also look for the mirror media
1062 header. The page #s of the found media headers are placed in mh0_page and 1062 header. The page #s of the found media headers are placed in mh0_page and
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index db7ae9d6a296..92320a643275 100644
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -475,7 +475,7 @@ int __nand_correct_data(unsigned char *buf,
475 * 475 *
476 * The b2 shift is there to get rid of the lowest two bits. 476 * The b2 shift is there to get rid of the lowest two bits.
477 * We could also do addressbits[b2] >> 1 but for the 477 * We could also do addressbits[b2] >> 1 but for the
478 * performace it does not make any difference 478 * performance it does not make any difference
479 */ 479 */
480 if (eccsize_mult == 1) 480 if (eccsize_mult == 1)
481 byte_addr = (addressbits[b1] << 4) + addressbits[b0]; 481 byte_addr = (addressbits[b1] << 4) + addressbits[b0];
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 11dc7e69c4fb..68b5b3a486a9 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -875,7 +875,7 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
875 * @info: The controller instance. 875 * @info: The controller instance.
876 * @nmtd: The driver version of the MTD instance. 876 * @nmtd: The driver version of the MTD instance.
877 * 877 *
878 * This routine is called after the chip probe has succesfully completed 878 * This routine is called after the chip probe has successfully completed
879 * and the relevant per-chip information updated. This call ensure that 879 * and the relevant per-chip information updated. This call ensure that
880 * we update the internal state accordingly. 880 * we update the internal state accordingly.
881 * 881 *
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig
index a38f580c2bb3..3a9f15784600 100644
--- a/drivers/mtd/onenand/Kconfig
+++ b/drivers/mtd/onenand/Kconfig
@@ -1,7 +1,3 @@
1#
2# linux/drivers/mtd/onenand/Kconfig
3#
4
5menuconfig MTD_ONENAND 1menuconfig MTD_ONENAND
6 tristate "OneNAND Device Support" 2 tristate "OneNAND Device Support"
7 depends on MTD 3 depends on MTD
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index b1cd7a1a2191..0a8c7ea764ae 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -1,5 +1,3 @@
1# drivers/mtd/ubi/Kconfig
2
3menu "UBI - Unsorted block images" 1menu "UBI - Unsorted block images"
4 depends on MTD 2 depends on MTD
5 3