diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/mtd/maps/Kconfig | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'drivers/mtd/maps/Kconfig')
| -rw-r--r-- | drivers/mtd/maps/Kconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 0b98654d8eed..7a58bd5522fd 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
| @@ -284,13 +284,6 @@ config MTD_L440GX | |||
| 284 | 284 | ||
| 285 | BE VERY CAREFUL. | 285 | BE VERY CAREFUL. |
| 286 | 286 | ||
| 287 | config MTD_SBC8240 | ||
| 288 | tristate "Flash device on SBC8240" | ||
| 289 | depends on MTD_JEDECPROBE && 8260 | ||
| 290 | help | ||
| 291 | Flash access on the SBC8240 board from Wind River. See | ||
| 292 | <http://www.windriver.com/products/sbc8240/> | ||
| 293 | |||
| 294 | config MTD_TQM8XXL | 287 | config MTD_TQM8XXL |
| 295 | tristate "CFI Flash device mapped on TQM8XXL" | 288 | tristate "CFI Flash device mapped on TQM8XXL" |
| 296 | depends on MTD_CFI && TQM8xxL | 289 | depends on MTD_CFI && TQM8xxL |