From: Tony Lindgren <tony@atomide.com>
Date: Fri, 5 Dec 2008 20:18:15 +0000 (-0800)
Subject: Misc fixes for upstream merge
X-Git-Tag: v2.6.28-omap1~89
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fb3d15c023ff08c879155db630895f38526b95f6;p=linux-2.6-omap-h63xx.git

Misc fixes for upstream merge

- Fix warning spurious may be uninitialized
- Tabify pandora board file

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index ec7ea03b6a8..39720eafb29 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -52,34 +52,34 @@
 #include "mmc-twl4030.h"
 
 
-#define NAND_BLOCK_SIZE SZ_128K
-#define GPMC_CS0_BASE  0x60
-#define GPMC_CS_SIZE   0x30
+#define NAND_BLOCK_SIZE			SZ_128K
+#define GPMC_CS0_BASE			0x60
+#define GPMC_CS_SIZE			0x30
 
 #define OMAP3_PANDORA_TS_GPIO		94
 
 static struct mtd_partition omap3pandora_nand_partitions[] = {
 	{
-		.name           = "xloader",
-		.offset         = 0,			/* Offset = 0x00000 */
-		.size           = 4 * NAND_BLOCK_SIZE,
-		.mask_flags     = MTD_WRITEABLE
+		.name		= "xloader",
+		.offset		= 0,			/* Offset = 0x00000 */
+		.size		= 4 * NAND_BLOCK_SIZE,
+		.mask_flags	= MTD_WRITEABLE
 	}, {
-		.name           = "uboot",
-		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x80000 */
-		.size           = 14 * NAND_BLOCK_SIZE,
+		.name		= "uboot",
+		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x80000 */
+		.size		= 14 * NAND_BLOCK_SIZE,
 	}, {
-		.name           = "uboot environment",
-		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x240000 */
-		.size           = 2 * NAND_BLOCK_SIZE,
+		.name		= "uboot environment",
+		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x240000 */
+		.size		= 2 * NAND_BLOCK_SIZE,
 	}, {
-		.name           = "linux",
-		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x280000 */
-		.size           = 32 * NAND_BLOCK_SIZE,
+		.name		= "linux",
+		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x280000 */
+		.size		= 32 * NAND_BLOCK_SIZE,
 	}, {
-		.name           = "rootfs",
-		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x680000 */
-		.size           = MTDPART_SIZ_FULL,
+		.name		= "rootfs",
+		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x680000 */
+		.size		= MTDPART_SIZ_FULL,
 	},
 };
 
@@ -253,7 +253,7 @@ static struct ads7846_platform_data ads7846_config = {
 
 static struct omap2_mcspi_device_config ads7846_mcspi_config = {
 	.turbo_mode	= 0,
-	.single_channel	= 1,  /* 0: slave, 1: master */
+	.single_channel	= 1,	/* 0: slave, 1: master */
 };
 
 static struct spi_board_info omap3pandora_spi_board_info[] __initdata = {
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 9c9e307360d..110acb9bce4 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -96,7 +96,7 @@ static void omap_mask_irq(unsigned int irq)
 	int offset = irq & (~(IRQ_BITS_PER_REG - 1));
 
 	if (cpu_is_omap34xx()) {
-		int spurious;
+		int spurious = 0;
 
 		/*
 		 * INT_34XX_GPT12_IRQ is also the spurious irq. Maybe because