diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
| commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
| tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /drivers/mtd/maps | |
| parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
| parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/maps')
| -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 f88ebc5b685e..cc6c73442435 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
| @@ -103,7 +103,7 @@ config MTD_PMC_MSP_RAMROOT | |||
| 103 | 103 | ||
| 104 | config MTD_SUN_UFLASH | 104 | config MTD_SUN_UFLASH |
| 105 | tristate "Sun Microsystems userflash support" | 105 | tristate "Sun Microsystems userflash support" |
| 106 | depends on SPARC && MTD_CFI | 106 | depends on SPARC && MTD_CFI && PCI |
| 107 | help | 107 | help |
| 108 | This provides a 'mapping' driver which supports the way in | 108 | This provides a 'mapping' driver which supports the way in |
| 109 | which user-programmable flash chips are connected on various | 109 | which user-programmable flash chips are connected on various |