diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:30:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:30:14 +0100 |
| commit | 41866a56cc4e676240b94ed8eaeca375aaef7496 (patch) | |
| tree | c389af72c041d4f105654ed28aacc6e582cb79e5 /drivers | |
| parent | [PATCH] VFS: local denial-of-service with file leases (diff) | |
| parent | [JFFS2] Remove broken and useless debug code (diff) | |
| download | linux-41866a56cc4e676240b94ed8eaeca375aaef7496.tar.xz linux-41866a56cc4e676240b94ed8eaeca375aaef7496.zip | |
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 48638c8097a5..846a533323a8 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 |