diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-02-21 10:16:55 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-02-22 04:07:30 -0500 |
| commit | edb15d83a875a1f4b1576188844db5c330c3267d (patch) | |
| tree | 74d54eab401b6ccf2a6ad4821227108a8d160f03 /arch/mips/Kconfig | |
| parent | 8bfc245f9ad7bd4e461179e4e7852ef99b8b6144 (diff) | |
| parent | a0b1c42951dd06ec83cc1bc2c9788131d9fefcd8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next
Conflicts:
include/linux/ssb/ssb_driver_gige.h
Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 6fe9a188c49f..9eb7eaa355ba 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -4,7 +4,6 @@ config MIPS | |||
| 4 | select HAVE_GENERIC_DMA_COHERENT | 4 | select HAVE_GENERIC_DMA_COHERENT |
| 5 | select HAVE_IDE | 5 | select HAVE_IDE |
| 6 | select HAVE_OPROFILE | 6 | select HAVE_OPROFILE |
| 7 | select HAVE_IRQ_WORK | ||
| 8 | select HAVE_PERF_EVENTS | 7 | select HAVE_PERF_EVENTS |
| 9 | select PERF_USE_VMALLOC | 8 | select PERF_USE_VMALLOC |
| 10 | select HAVE_ARCH_KGDB | 9 | select HAVE_ARCH_KGDB |
| @@ -2162,7 +2161,6 @@ source "mm/Kconfig" | |||
| 2162 | config SMP | 2161 | config SMP |
| 2163 | bool "Multi-Processing support" | 2162 | bool "Multi-Processing support" |
| 2164 | depends on SYS_SUPPORTS_SMP | 2163 | depends on SYS_SUPPORTS_SMP |
| 2165 | select IRQ_PER_CPU | ||
| 2166 | select USE_GENERIC_SMP_HELPERS | 2164 | select USE_GENERIC_SMP_HELPERS |
| 2167 | help | 2165 | help |
| 2168 | This enables support for systems with more than one CPU. If you have | 2166 | This enables support for systems with more than one CPU. If you have |