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

Commit 46cddc01 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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

Conflicts:
	arch/arm/mach-omap1/devices.c
	arch/arm/mach-omap2/omap_hwmod_33xx_data.c
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
	drivers/mmc/host/omap.c
parents 99f0b8d6 53db20d1

arch/arm/mach-omap1/board-h2-mmc.c

+2 −3
Original line number Diff line number Diff line
@@ -13,12 +13,11 @@ 
 */

#include <linux/gpio.h>

#include <linux/platform_device.h>



#include <linux/platform_data/gpio-omap.h>

#include <linux/i2c/tps65010.h>



#include <plat/mmc.h>



#include "board-h2.h"

#include "mmc.h"



#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)

arch/arm/mach-omap1/board-h3-mmc.c

+1 −2
Original line number Diff line number Diff line
@@ -16,9 +16,8 @@ 


#include <linux/i2c/tps65010.h>



#include <plat/mmc.h>



#include "board-h3.h"

#include "mmc.h"



#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)

arch/arm/mach-omap1/board-htcherald.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <asm/mach/arch.h>



#include <mach/omap7xx.h>

#include <plat/mmc.h>

#include "mmc.h"



#include <mach/irqs.h>

#include <mach/usb.h>

arch/arm/mach-omap1/board-innovator.c

+1 −1
Original line number Diff line number Diff line
@@ -36,13 +36,13 @@ 
#include <plat/fpga.h>

#include <plat/tc.h>

#include <linux/platform_data/keypad-omap.h>

#include <plat/mmc.h>



#include <mach/hardware.h>

#include <mach/usb.h>



#include "iomap.h"

#include "common.h"

#include "mmc.h"



/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */

#define INNOVATOR1610_ETHR_START	0x04000300

arch/arm/mach-omap1/board-nokia770.c

+1 −1
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 
#include <asm/mach/map.h>



#include <mach/mux.h>

#include <plat/mmc.h>

#include <plat/clock.h>



#include <mach/hardware.h>

#include <mach/usb.h>



#include "common.h"

#include "mmc.h"



#define ADS7846_PENDOWN_GPIO	15