Skip to content

Commit

Permalink
ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h
Browse files Browse the repository at this point in the history
We can move menelaus.h to live with other mfd headers to
get it out of plat for ARM common zImage support.

Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Tony Lindgren committed Oct 15, 2012
1 parent ddffeb8 commit 7bd3b61
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/board-h4.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/input/matrix_keypad.h>
#include <linux/mfd/menelaus.h>

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

#include <plat/menelaus.h>
#include <plat/dma.h>
#include <plat/gpmc.h>
#include "debug-devices.h"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/board-n8x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
#include <linux/usb/musb.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/mtd-onenand-omap2.h>
#include <linux/mfd/menelaus.h>
#include <sound/tlv320aic3x.h>

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

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

#include "mux.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/menelaus.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
#include <linux/rtc.h>
#include <linux/bcd.h>
#include <linux/slab.h>
#include <linux/mfd/menelaus.h>

#include <asm/mach/irq.h>

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

#define DRIVER_NAME "menelaus"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/*
* arch/arm/plat-omap/include/mach/menelaus.h
*
* Functions to access Menelaus power management chip
*/

Expand Down

0 comments on commit 7bd3b61

Please sign in to comment.