diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
| commit | 04cf399640b7acfa9abe2eb7900cd934db8af697 (patch) | |
| tree | f9a055f2f0170550f5f0b0507b06ffce8d98945d /arch/mips/sibyte/Kconfig | |
| parent | 17f0056e6a2f3d1818801705f5e12b71217bf4ef (diff) | |
| parent | a0e86bd4252519321b0d102dc4ed90557aa7bee9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/mips/sibyte/Kconfig')
| -rw-r--r-- | arch/mips/sibyte/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig index 3e639bda43f7..3cd937e0e9a3 100644 --- a/arch/mips/sibyte/Kconfig +++ b/arch/mips/sibyte/Kconfig | |||
| @@ -71,7 +71,6 @@ config SIBYTE_SB1xxx_SOC | |||
| 71 | bool | 71 | bool |
| 72 | select DMA_COHERENT | 72 | select DMA_COHERENT |
| 73 | select IRQ_CPU | 73 | select IRQ_CPU |
| 74 | select SIBYTE_CFE | ||
| 75 | select SWAP_IO_SPACE | 74 | select SWAP_IO_SPACE |
| 76 | select SYS_SUPPORTS_32BIT_KERNEL | 75 | select SYS_SUPPORTS_32BIT_KERNEL |
| 77 | select SYS_SUPPORTS_64BIT_KERNEL | 76 | select SYS_SUPPORTS_64BIT_KERNEL |