diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:18 -0400 |
| commit | d2ff6de537c61a0f05731c6679f3e1abc2d95e68 (patch) | |
| tree | 821aa38121f57a9d5419388ef10ea6f3aa445d4d /arch/sparc/Kconfig | |
| parent | e23a8b6a8f319c0f08b6ccef2dccbb37e7603dc2 (diff) | |
| parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Queueing up dependent early-printk fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/Kconfig')
| -rw-r--r-- | arch/sparc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 86b82348b97c..97fca4695e0b 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -25,7 +25,7 @@ config SPARC | |||
| 25 | select ARCH_WANT_OPTIONAL_GPIOLIB | 25 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 26 | select RTC_CLASS | 26 | select RTC_CLASS |
| 27 | select RTC_DRV_M48T59 | 27 | select RTC_DRV_M48T59 |
| 28 | select HAVE_PERF_COUNTERS | 28 | select HAVE_PERF_EVENTS |
| 29 | select HAVE_DMA_ATTRS | 29 | select HAVE_DMA_ATTRS |
| 30 | select HAVE_DMA_API_DEBUG | 30 | select HAVE_DMA_API_DEBUG |
| 31 | 31 | ||
| @@ -47,7 +47,7 @@ config SPARC64 | |||
| 47 | select RTC_DRV_BQ4802 | 47 | select RTC_DRV_BQ4802 |
| 48 | select RTC_DRV_SUN4V | 48 | select RTC_DRV_SUN4V |
| 49 | select RTC_DRV_STARFIRE | 49 | select RTC_DRV_STARFIRE |
| 50 | select HAVE_PERF_COUNTERS | 50 | select HAVE_PERF_EVENTS |
| 51 | 51 | ||
| 52 | config ARCH_DEFCONFIG | 52 | config ARCH_DEFCONFIG |
| 53 | string | 53 | string |