diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 11:03:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 11:03:48 -0400 |
| commit | c07724e5b868c603f2a65f3855c77b23454db3ed (patch) | |
| tree | 658b1f0af5966e418f48a53e8b2f97e10b250f4f /arch/sparc/Kconfig | |
| parent | 302f5bc54448bd2b37d5a8be9b6abc29397827ef (diff) | |
| parent | e69f58c037ab5b166b3858fa7b5d7fa470613e8f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
kbuild: add ARCH=sparc32 target
sparc32: fix build failure on CONFIG_SPARC_LEON
sparc: Fixed random SPARC/LEON SMP CPU Stuck problem.
sparc32: remove CONFIG_HAVE_PERF_EVENTS option
sparc: don't #include asm/system.h in asm/jump_label.h
sparc32: Fix unaligned stack handling on trap return.
sparc: keep calling do_signal() as long as pending signals remain
Diffstat (limited to 'arch/sparc/Kconfig')
| -rw-r--r-- | arch/sparc/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index a9aaed3c3d97..45d9c87d083a 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -22,8 +22,6 @@ config SPARC | |||
| 22 | select RTC_CLASS | 22 | select RTC_CLASS |
| 23 | select RTC_DRV_M48T59 | 23 | select RTC_DRV_M48T59 |
| 24 | select HAVE_IRQ_WORK | 24 | select HAVE_IRQ_WORK |
| 25 | select HAVE_PERF_EVENTS | ||
| 26 | select PERF_USE_VMALLOC | ||
| 27 | select HAVE_DMA_ATTRS | 25 | select HAVE_DMA_ATTRS |
| 28 | select HAVE_DMA_API_DEBUG | 26 | select HAVE_DMA_API_DEBUG |
| 29 | select HAVE_ARCH_JUMP_LABEL | 27 | select HAVE_ARCH_JUMP_LABEL |
| @@ -50,7 +48,6 @@ config SPARC64 | |||
| 50 | select RTC_DRV_BQ4802 | 48 | select RTC_DRV_BQ4802 |
| 51 | select RTC_DRV_SUN4V | 49 | select RTC_DRV_SUN4V |
| 52 | select RTC_DRV_STARFIRE | 50 | select RTC_DRV_STARFIRE |
| 53 | select HAVE_IRQ_WORK | ||
| 54 | select HAVE_PERF_EVENTS | 51 | select HAVE_PERF_EVENTS |
| 55 | select PERF_USE_VMALLOC | 52 | select PERF_USE_VMALLOC |
| 56 | 53 | ||