diff options
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/mmp2.h | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-pxav2.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-pxav3.c | 2 | ||||
| -rw-r--r-- | include/linux/platform_data/pxa_sdhci.h (renamed from arch/arm/plat-pxa/include/plat/sdhci.h) | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-mmp/include/mach/mmp2.h b/arch/arm/mach-mmp/include/mach/mmp2.h index 2cbf6df09b82..de7b88826ad7 100644 --- a/arch/arm/mach-mmp/include/mach/mmp2.h +++ b/arch/arm/mach-mmp/include/mach/mmp2.h @@ -1,7 +1,7 @@ #ifndef __ASM_MACH_MMP2_H #define __ASM_MACH_MMP2_H -#include <plat/sdhci.h> +#include <linux/platform_data/pxa_sdhci.h> struct sys_timer; diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c index 7a6fa8c08363..38f58994f79a 100644 --- a/drivers/mmc/host/sdhci-pxav2.c +++ b/drivers/mmc/host/sdhci-pxav2.c @@ -25,7 +25,7 @@ #include <linux/gpio.h> #include <linux/mmc/card.h> #include <linux/mmc/host.h> -#include <plat/sdhci.h> +#include <linux/platform_data/pxa_sdhci.h> #include <linux/slab.h> #include "sdhci.h" #include "sdhci-pltfm.h" diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 901f00fb252b..4198dbbc5c20 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -24,7 +24,7 @@ #include <linux/gpio.h> #include <linux/mmc/card.h> #include <linux/mmc/host.h> -#include <plat/sdhci.h> +#include <linux/platform_data/pxa_sdhci.h> #include <linux/slab.h> #include <linux/delay.h> #include "sdhci.h" diff --git a/arch/arm/plat-pxa/include/plat/sdhci.h b/include/linux/platform_data/pxa_sdhci.h index 800ebc149fc1..51ad0995abac 100644 --- a/arch/arm/plat-pxa/include/plat/sdhci.h +++ b/include/linux/platform_data/pxa_sdhci.h @@ -1,4 +1,5 @@ -/* linux/arch/arm/plat-pxa/include/plat/sdhci.h +/* + * include/linux/platform_data/pxa_sdhci.h * * Copyright 2010 Marvell * Zhangfei Gao <zhangfei.gao@marvell.com> @@ -10,8 +11,8 @@ * published by the Free Software Foundation. */ -#ifndef __PLAT_PXA_SDHCI_H -#define __PLAT_PXA_SDHCI_H +#ifndef _PXA_SDHCI_H_ +#define _PXA_SDHCI_H_ /* pxa specific flag */ /* Require clock free running */ @@ -56,5 +57,4 @@ struct sdhci_pxa { u8 clk_enable; u8 power_mode; }; - -#endif /* __PLAT_PXA_SDHCI_H */ +#endif /* _PXA_SDHCI_H_ */ |