| Message ID | 1347484551-11775-2-git-send-email-hvaibhav@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Vaibhav Hiremath <hvaibhav@ti.com> [120912 14:16]: > With recent mainline changes on gpio and mcspi drivers, the > platform specific header files (plat/gpio.h and plat/mcspi.h) > have been removed, which results into build failure on > AM33XX hwmod data, which was still using these headers. > > This patch removes such both gpio and spi header file entry > from omap_hwmod_33xx_data.c. > > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> > Cc: Paul Walmsley <paul@pwsan.com> > --- > arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c > index de7a3ab..7b7ed08 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c > @@ -14,12 +14,14 @@ > * GNU General Public License for more details. > */ > > +#include <linux/io.h> > +#include <linux/platform_data/gpio-omap.h> > +#include <linux/platform_data/spi-omap2-mcspi.h> > + > #include <plat/omap_hwmod.h> > #include <plat/cpu.h> > -#include <plat/gpio.h> > #include <plat/dma.h> > #include <plat/mmc.h> > -#include <plat/mcspi.h> > #include <plat/i2c.h> > > #include "omap_hwmod_common_data.h" This I can fix up when merging Paul's stuff with sparseirq changes. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c index de7a3ab..7b7ed08 100644 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c @@ -14,12 +14,14 @@ * GNU General Public License for more details. */ +#include <linux/io.h> +#include <linux/platform_data/gpio-omap.h> +#include <linux/platform_data/spi-omap2-mcspi.h> + #include <plat/omap_hwmod.h> #include <plat/cpu.h> -#include <plat/gpio.h> #include <plat/dma.h> #include <plat/mmc.h> -#include <plat/mcspi.h> #include <plat/i2c.h> #include "omap_hwmod_common_data.h"
With recent mainline changes on gpio and mcspi drivers, the platform specific header files (plat/gpio.h and plat/mcspi.h) have been removed, which results into build failure on AM33XX hwmod data, which was still using these headers. This patch removes such both gpio and spi header file entry from omap_hwmod_33xx_data.c. Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Cc: Paul Walmsley <paul@pwsan.com> --- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)