Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fc54fd3 authored Oct 26, 2012 by Tony Lindgren

Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm

parents 8634155e a0212796

arch/arm/mach-omap1/fpga.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@
	#include <mach/hardware.h>		#include <mach/hardware.h>

	#include "iomap.h"		#include "iomap.h"
			#include "common.h"

	static void fpga_mask_irq(struct irq_data *d)		static void fpga_mask_irq(struct irq_data *d)
	{		{

arch/arm/mach-omap1/pm_bus.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,8 @@
	#include <linux/clk.h>		#include <linux/clk.h>
	#include <linux/err.h>		#include <linux/err.h>

			#include "soc.h"

	#ifdef CONFIG_PM_RUNTIME		#ifdef CONFIG_PM_RUNTIME
	static int omap1_pm_runtime_suspend(struct device *dev)		static int omap1_pm_runtime_suspend(struct device *dev)
	{		{

arch/arm/mach-omap2/board-h4.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,12 +26,12 @@
	#include <linux/clk.h>		#include <linux/clk.h>
	#include <linux/io.h>		#include <linux/io.h>
	#include <linux/input/matrix_keypad.h>		#include <linux/input/matrix_keypad.h>
			#include <linux/mfd/menelaus.h>

	#include <asm/mach-types.h>		#include <asm/mach-types.h>
	#include <asm/mach/arch.h>		#include <asm/mach/arch.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>

	#include <plat/menelaus.h>
	#include <plat-omap/dma-omap.h>		#include <plat-omap/dma-omap.h>
	#include "debug-devices.h"		#include "debug-devices.h"

arch/arm/mach-omap2/board-n8x0.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,13 +22,13 @@
	#include <linux/usb/musb.h>		#include <linux/usb/musb.h>
	#include <linux/platform_data/spi-omap2-mcspi.h>		#include <linux/platform_data/spi-omap2-mcspi.h>
	#include <linux/platform_data/mtd-onenand-omap2.h>		#include <linux/platform_data/mtd-onenand-omap2.h>
			#include <linux/mfd/menelaus.h>
	#include <sound/tlv320aic3x.h>		#include <sound/tlv320aic3x.h>

	#include <asm/mach/arch.h>		#include <asm/mach/arch.h>
	#include <asm/mach-types.h>		#include <asm/mach-types.h>

	#include "common.h"		#include "common.h"
	#include <plat/menelaus.h>
	#include "mmc.h"		#include "mmc.h"

	#include "mux.h"		#include "mux.h"

drivers/mfd/menelaus.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,11 +41,11 @@
	#include <linux/rtc.h>		#include <linux/rtc.h>
	#include <linux/bcd.h>		#include <linux/bcd.h>
	#include <linux/slab.h>		#include <linux/slab.h>
			#include <linux/mfd/menelaus.h>

	#include <asm/mach/irq.h>		#include <asm/mach/irq.h>

	#include <asm/gpio.h>		#include <asm/gpio.h>
	#include <plat/menelaus.h>

	#define DRIVER_NAME "menelaus"		#define DRIVER_NAME "menelaus"