From: Kevin Hilman <khilman@deeprootsystems.com>
To: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>
Cc: Tony Lindgren <tony@atomide.com>,
linux-omap <linux-omap@vger.kernel.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
Subject: arm-soc/for-next: fixup compile after platform_data move
Date: Thu, 20 Sep 2012 09:38:14 -0700 [thread overview]
Message-ID: <87obl0hcp5.fsf@deeprootsystems.com> (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
>From cae062932d1d28e499b03d31da815fc2696badfd Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@ti.com>
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.
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 22433cb..59d5c1c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -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"
--
1.7.9.2
WARNING: multiple messages have this Message-ID (diff)
From: khilman@deeprootsystems.com (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: arm-soc/for-next: fixup compile after platform_data move
Date: Thu, 20 Sep 2012 09:38:14 -0700 [thread overview]
Message-ID: <87obl0hcp5.fsf@deeprootsystems.com> (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
>From cae062932d1d28e499b03d31da815fc2696badfd Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@ti.com>
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.
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 22433cb..59d5c1c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -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"
--
1.7.9.2
next reply other threads:[~2012-09-20 16:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 16:38 Kevin Hilman [this message]
2012-09-20 16:38 ` arm-soc/for-next: fixup compile after platform_data move Kevin Hilman
2012-09-20 18:23 ` Tony Lindgren
2012-09-20 18:23 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87obl0hcp5.fsf@deeprootsystems.com \
--to=khilman@deeprootsystems.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=olof@lixom.net \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.