mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers
Conflicts: arch/arm/mach-omap2/board-h4.c arch/arm/mach-omap2/board-n8x0.c
This commit is contained in:
commit
2da8a79f7d
4 changed files with 3 additions and 5 deletions
|
@ -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-omap/dma-omap.h>
|
||||
#include "debug-devices.h"
|
||||
|
||||
|
|
|
@ -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 "mmc.h"
|
||||
|
||||
#include "mux.h"
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
/*
|
||||
* arch/arm/plat-omap/include/mach/menelaus.h
|
||||
*
|
||||
* Functions to access Menelaus power management chip
|
||||
*/
|
||||
|
Loading…
Reference in a new issue