diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-13 23:28:58 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-13 23:28:58 -0500 |
| commit | 7b0a65f9923ffe7885a5473648baaa3a1a701726 (patch) | |
| tree | b9be4a0504b4e637b86bdc92d88268ff57ea1bc5 /drivers/mtd/maps/Kconfig | |
| parent | 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 (diff) | |
| parent | ee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/mtd/maps/Kconfig')
| -rw-r--r-- | drivers/mtd/maps/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 48638c8097a5..846a533323a8 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
| @@ -94,7 +94,7 @@ config MTD_NETSC520 | |||
| 94 | 94 | ||
| 95 | config MTD_TS5500 | 95 | config MTD_TS5500 |
| 96 | tristate "JEDEC Flash device mapped on Technologic Systems TS-5500" | 96 | tristate "JEDEC Flash device mapped on Technologic Systems TS-5500" |
| 97 | depends on ELAN | 97 | depends on X86 |
| 98 | select MTD_PARTITIONS | 98 | select MTD_PARTITIONS |
| 99 | select MTD_JEDECPROBE | 99 | select MTD_JEDECPROBE |
| 100 | select MTD_CFI_AMDSTD | 100 | select MTD_CFI_AMDSTD |