diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-16 10:45:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-16 10:45:23 +1000 |
| commit | 6857bc8a8c89c27acb12d61ca591af5faed24e22 (patch) | |
| tree | 002c5f27506e03122290670db890ac63cd9dd843 /arch/mips/Kconfig | |
| parent | ff8ecb77c6cd90166592df4da7a649c80e47f166 (diff) | |
| parent | 82e55f64130a74d2c2c4d83695151de4a58ff376 (diff) | |
Merge commit 'mips/mips-for-linux-next'
Conflicts:
drivers/char/hw_random/Kconfig
drivers/char/hw_random/Makefile
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 25f3b0a11ca8..96f05e588f4c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -618,6 +618,8 @@ config CAVIUM_OCTEON_REFERENCE_BOARD select SYS_HAS_EARLY_PRINTK select SYS_HAS_CPU_CAVIUM_OCTEON select SWAP_IO_SPACE + select HW_HAS_PCI + select ARCH_SUPPORTS_MSI help This option supports all of the Octeon reference boards from Cavium Networks. It builds a kernel that dynamically determines the Octeon |