korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-29 14:05:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'depends/omap-cleanup-headers-menelaus' into next/headers

Browse Source 
Again, resolve conflicts identical to how Tony did.

Conflicts:
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n8x0.c

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2012-11-05 10:28:21 -08:00
commit 6c97a18959
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/board-h4.c
View File

@ -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"

2
arch/arm/mach-omap2/board-n8x0.c
View File

@ -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"

2
drivers/mfd/menelaus.c
View File

@ -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"

2
arch/arm/plat-omap/include/plat/menelaus.h → include/linux/mfd/menelaus.h
View File

@ -1,6 +1,4 @@
/* /*
* arch/arm/plat-omap/include/mach/menelaus.h
*
* Functions to access Menelaus power management chip * Functions to access Menelaus power management chip
*/ */