Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Benjamin Herrenschmidt [Tue, 15 Jul 2008 05:44:51 +0000 (15:44 +1000)]
Manual fixup of:

arch/powerpc/Kconfig

18 files changed:
1  2 
MAINTAINERS
Makefile
arch/powerpc/Kconfig
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/ppc_ksyms.c
arch/powerpc/kernel/setup_32.c
arch/powerpc/kernel/vmlinux.lds.S
drivers/char/Makefile
drivers/char/viotape.c
drivers/macintosh/adb.c
drivers/macintosh/smu.c
drivers/net/Kconfig
drivers/pcmcia/m8xx_pcmcia.c
include/linux/mm.h
mm/mprotect.c

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
@@@ -112,8 -111,7 +114,8 @@@ config PP
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_LMB
 +      select HAVE_DMA_ATTRS if PPC64
+       select HAVE_OPROFILE
  
  config EARLY_PRINTK
        bool
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -59,8 -57,9 +59,7 @@@
  #include <asm/8xx_immap.h>
  #include <asm/irq.h>
  #include <asm/fs_pd.h>
 -#include <asm/of_device.h>
 -#include <asm/of_platform.h>
  
- #include <pcmcia/version.h>
  #include <pcmcia/cs_types.h>
  #include <pcmcia/cs.h>
  #include <pcmcia/ss.h>
Simple merge
diff --cc mm/mprotect.c
Simple merge