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

Commit 826c71a0 authored by Andreas Fenkart's avatar Andreas Fenkart Committed by Ulf Hansson
Browse files

ARM: OMAP2: MMC: include mmc-omap platform header directly 



Only a few files really need that platform header. When later splitting
omap_mmc_platform_data into omap_mmc and omap_mmc_hs, those files
declaring an hs mmc platform data will have to change the platform
include, which is a good sanity check.
Also removing omap242x_init_mmc, which is not used anywhere, checked
with grep.

Signed-off-by: default avatarAndreas Fenkart <afenkart@gmail.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b5b64fa6

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

+2 −0
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ 
#include <linux/i2c.h>

#include <linux/spi/spi.h>

#include <linux/usb/musb.h>

#include <linux/mmc/host.h>

#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/platform_data/mtd-onenand-omap2.h>

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

#include <linux/mfd/menelaus.h>

#include <sound/tlv320aic3x.h>

arch/arm/mach-omap2/hsmmc.c

+2 −1
Original line number Diff line number Diff line
@@ -14,14 +14,15 @@ 
#include <linux/string.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/mmc/host.h>

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

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



#include "soc.h"

#include "omap_device.h"

#include "omap-pm.h"



#include "mux.h"

#include "mmc.h"

#include "hsmmc.h"

#include "control.h"

arch/arm/mach-omap2/mmc.h

+0 −10
Original line number Diff line number Diff line 
#include <linux/mmc/host.h>

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



#define OMAP24XX_NR_MMC		2

#define OMAP2420_MMC_SIZE	OMAP1_MMC_SIZE
@@ -7,14 +5,6 @@ 


#define OMAP4_MMC_REG_OFFSET	0x100



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

void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data);

#else

static inline void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data)

{

}

#endif



struct omap_hwmod;

int omap_msdi_reset(struct omap_hwmod *oh);

arch/arm/mach-omap2/omap4-common.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include "soc.h"

#include "iomap.h"

#include "common.h"

#include "mmc.h"

#include "prminst44xx.h"

#include "prcm_mpu44xx.h"

#include "omap4-sar-layout.h"

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+1 −1
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 


#include <linux/i2c-omap.h>

#include <linux/platform_data/asoc-ti-mcbsp.h>

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

#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/omap-dma.h>

#include <plat/dmtimer.h>



#include "omap_hwmod.h"

#include "mmc.h"

#include "l3_2xxx.h"



#include "soc.h"