Skip to contentSkip to conversation

arm-soc/for-next: fixup compile after platform_data move

PATCH Kevin Hilman 2 participants 2 messages Sep 20, 2012

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Arnd, Olof,

Not sure if this has been reported yet, but arm-soc/for-next now has a build error on omap due to the recent merge of the platform_data move series.

The arm-soc/next/soc branch contains the arm-soc/omap/am33xx branch which adds an include of "plat/mscpi.h" which has now moved.

Below is a simple fix.

Kevin

Quoted 1 line

From cae062932d1d28e499b03d31da815fc2696badfd Mon Sep 17 00:00:00 2001

From: Kevin Hilman <[email protected]>
Date: Thu, 20 Sep 2012 09:28:43 -0700
Subject: [PATCH] ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move

AM33xx hwmod data includes "mcspi.h" which has now been moved after the platform_data move. Fix it.

---
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +1 -1
index 22433cb..59d5c1c 100644
@@ -17,9 +17,9 @@
 #include <plat/omap_hwmod.h>
 #include <plat/cpu.h>
 #include <linux/platform_data/gpio-omap.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <plat/dma.h>
 #include <plat/mmc.h>
-#include <plat/mcspi.h>
 #include <plat/i2c.h>
 
 #include "omap_hwmod_common_data.h"
Signature · 1 line
1.7.9.2
maintainer Acked-by
#1 lore raw
Quoted 19 lines · Kevin Hilman

Arnd, Olof,

Not sure if this has been reported yet, but arm-soc/for-next now has a build error on omap due to the recent merge of the platform_data move series.

The arm-soc/next/soc branch contains the arm-soc/omap/am33xx branch which adds an include of "plat/mscpi.h" which has now moved.

Below is a simple fix.

Kevin

From cae062932d1d28e499b03d31da815fc2696badfd Mon Sep 17 00:00:00 2001
From: Kevin Hilman <[email protected]>
Date: Thu, 20 Sep 2012 09:28:43 -0700
Subject: [PATCH] ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move

Quoted 4 lines

AM33xx hwmod data includes "mcspi.h" which has now been moved after the platform_data move. Fix it.

Quoted 25 lines
---
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +1 -1
index 22433cb..59d5c1c 100644
@@ -17,9 +17,9 @@
 #include <plat/omap_hwmod.h>
 #include <plat/cpu.h>
 #include <linux/platform_data/gpio-omap.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <plat/dma.h>
 #include <plat/mmc.h>
-#include <plat/mcspi.h>
 #include <plat/i2c.h>
 
 #include "omap_hwmod_common_data.h"
Signature · 5 lines
1.7.9.2
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html