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

Commit 6c97a189 authored Nov 05, 2012 by Olof Johansson

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



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>

parents 365480d6 7bd3b618

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"

drivers/mfd/menelaus.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"

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

+0 −2

Original line number	Diff line number	Diff line
		/*
		* arch/arm/plat-omap/include/mach/menelaus.h
		*
		* Functions to access Menelaus power management chip
		*/