diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
| commit | 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch) | |
| tree | aa2aac22a5b329b778a6771a87bbf1945ad49bbd /arch/powerpc/Kconfig | |
| parent | d278c48435625cb6b7edcf6a547620768b175709 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into perfcounters/core
Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index e39b73bc0ff8..74cc312c347c 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -876,10 +876,6 @@ source "drivers/Kconfig" | |||
| 876 | 876 | ||
| 877 | source "fs/Kconfig" | 877 | source "fs/Kconfig" |
| 878 | 878 | ||
| 879 | # XXX source "arch/ppc/8xx_io/Kconfig" | ||
| 880 | |||
| 881 | # XXX source "arch/ppc/8260_io/Kconfig" | ||
| 882 | |||
| 883 | source "arch/powerpc/sysdev/qe_lib/Kconfig" | 879 | source "arch/powerpc/sysdev/qe_lib/Kconfig" |
| 884 | 880 | ||
| 885 | source "lib/Kconfig" | 881 | source "lib/Kconfig" |