diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 12:30:14 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 12:30:14 -0800 |
commit | 41866a56cc4e676240b94ed8eaeca375aaef7496 (patch) | |
tree | c389af72c041d4f105654ed28aacc6e582cb79e5 /drivers | |
parent | f3a9388e4ebea57583272007311fffa26ebbb305 (diff) | |
parent | 5b9d1f19a7d6f13a97ac3eea9a1caea011ebd0ae (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Diffstat (limited to 'drivers')
-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 48638c8097a..846a533323a 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -94,7 +94,7 @@ config MTD_NETSC520 config MTD_TS5500 tristate "JEDEC Flash device mapped on Technologic Systems TS-5500" - depends on ELAN + depends on X86 select MTD_PARTITIONS select MTD_JEDECPROBE select MTD_CFI_AMDSTD |