From: Andrew Morton <akpm@linux-foundation.org>

whitespace diddles

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Kumar Gala <galak@gate.crashing.org>
Cc: Olof Johansson <olof@lixom.net>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Vitaly Bordug <vitb@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/powerpc/sysdev/mpc8xx_pic.h |    3 ++-
 drivers/pcmcia/Kconfig           |   14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff -puN arch/powerpc/sysdev/mpc8xx_pic.h~8xx-mpc885ads-pcmcia-support-fix arch/powerpc/sysdev/mpc8xx_pic.h
--- a/arch/powerpc/sysdev/mpc8xx_pic.h~8xx-mpc885ads-pcmcia-support-fix
+++ a/arch/powerpc/sysdev/mpc8xx_pic.h
@@ -11,7 +11,8 @@ unsigned int mpc8xx_get_irq(void);
  * Some internal interrupt registers use an 8-bit mask for the interrupt
  * level instead of a number.
  */
-static inline uint mk_int_int_mask(uint mask) {
+static inline uint mk_int_int_mask(uint mask)
+{
 	return (1 << (7 - (mask/2)));
 }
 
diff -puN drivers/pcmcia/Kconfig~8xx-mpc885ads-pcmcia-support-fix drivers/pcmcia/Kconfig
--- a/drivers/pcmcia/Kconfig~8xx-mpc885ads-pcmcia-support-fix
+++ a/drivers/pcmcia/Kconfig
@@ -180,15 +180,15 @@ config TCIC
 	  PCMCIA cards are plugged into. If unsure, say N.
 
 config PCMCIA_M8XX
-        tristate "MPC8xx PCMCIA support"
-        depends on PCMCIA && PPC && 8xx 
-        select PCCARD_IODYN
+	tristate "MPC8xx PCMCIA support"
+	depends on PCMCIA && PPC && 8xx
+	select PCCARD_IODYN
 	select PCCARD_NONSTATIC
-        help
-        Say Y here to include support for PowerPC 8xx series PCMCIA
-        controller.
+	help
+	  Say Y here to include support for PowerPC 8xx series PCMCIA
+	  controller.
 
-        This driver is also available as a module called m8xx_pcmcia.
+	  This driver is also available as a module called m8xx_pcmcia.
 
 config HD64465_PCMCIA
 	tristate "HD64465 host bridge support"
_