From: Benjamin Herrenschmidt Date: Tue, 15 Jul 2008 05:44:51 +0000 (+1000) Subject: Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build X-Git-Tag: v2.6.27-rc1~1058^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=43d2548bb2ef7e6d753f91468a746784041e522d;p=linux-2.6-omap-h63xx.git Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build Manual fixup of: arch/powerpc/Kconfig --- 43d2548bb2ef7e6d753f91468a746784041e522d diff --cc arch/powerpc/Kconfig index 06b72771ae2,a5e9912e2d3..1530a41fc56 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@@ -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 diff --cc drivers/pcmcia/m8xx_pcmcia.c index 9c5be9a2f3f,13a5fbd50a0..ff66604e90d --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c @@@ -59,8 -57,9 +59,7 @@@ #include #include #include -#include -#include - #include #include #include #include