diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-30 10:26:45 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-30 10:26:45 -0400 |
| commit | 05cd2544f4b64d9a9eca0d170191867495e01feb (patch) | |
| tree | 10146fb79bba464bac6f620d03b8cd50285065b7 /arch/mips/txx9/Kconfig | |
| parent | 27f680adc65ca08bf72ed85d3a48d1ee70f77c7a (diff) | |
| parent | a0601c8944dc08c2d349c24bd9c0b09c406229fc (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/mips/txx9/Kconfig')
| -rw-r--r-- | arch/mips/txx9/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig index 17052db4161d..226e8bb2f0a1 100644 --- a/arch/mips/txx9/Kconfig +++ b/arch/mips/txx9/Kconfig | |||
| @@ -46,9 +46,10 @@ config TOSHIBA_RBTX4938 | |||
| 46 | support this machine type | 46 | support this machine type |
| 47 | 47 | ||
| 48 | config TOSHIBA_RBTX4939 | 48 | config TOSHIBA_RBTX4939 |
| 49 | bool "Toshiba RBTX4939 bobard" | 49 | bool "Toshiba RBTX4939 board" |
| 50 | depends on MACH_TX49XX | 50 | depends on MACH_TX49XX |
| 51 | select SOC_TX4939 | 51 | select SOC_TX4939 |
| 52 | select TXX9_7SEGLED | ||
| 52 | help | 53 | help |
| 53 | This Toshiba board is based on the TX4939 processor. Say Y here to | 54 | This Toshiba board is based on the TX4939 processor. Say Y here to |
| 54 | support this machine type | 55 | support this machine type |
| @@ -86,6 +87,9 @@ config SOC_TX4939 | |||
| 86 | select HW_HAS_PCI | 87 | select HW_HAS_PCI |
| 87 | select PCI_TX4927 | 88 | select PCI_TX4927 |
| 88 | 89 | ||
| 90 | config TXX9_7SEGLED | ||
| 91 | bool | ||
| 92 | |||
| 89 | config TOSHIBA_FPCIB0 | 93 | config TOSHIBA_FPCIB0 |
| 90 | bool "FPCIB0 Backplane Support" | 94 | bool "FPCIB0 Backplane Support" |
| 91 | depends on PCI && MACH_TXX9 | 95 | depends on PCI && MACH_TXX9 |