diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
| commit | 65fb0d23fcddd8697c871047b700c78817bdaa43 (patch) | |
| tree | 119e6e5f276622c4c862f6c9b6d795264ba1603a /arch/powerpc/platforms/embedded6xx/Kconfig | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
| parent | dfbbe89e197a77f2c8046a51c74e33e35f878080 (diff) | |
Merge branch 'linus' into cpumask-for-linus
Conflicts:
arch/x86/kernel/cpu/common.c
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig index 4f9f8184d164..291ac9d8cbee 100644 --- a/arch/powerpc/platforms/embedded6xx/Kconfig +++ b/arch/powerpc/platforms/embedded6xx/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config EMBEDDED6xx | 1 | config EMBEDDED6xx |
| 2 | bool "Embedded 6xx/7xx/7xxx-based boards" | 2 | bool "Embedded 6xx/7xx/7xxx-based boards" |
| 3 | depends on PPC32 && BROKEN_ON_SMP && PPC_MULTIPLATFORM | 3 | depends on 6xx && BROKEN_ON_SMP |
| 4 | 4 | ||
| 5 | config LINKSTATION | 5 | config LINKSTATION |
| 6 | bool "Linkstation / Kurobox(HG) from Buffalo" | 6 | bool "Linkstation / Kurobox(HG) from Buffalo" |