diff options
author | Zhangfei Gao <zhangfei.gao@marvell.com> | 2011-06-20 10:11:52 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-07-20 17:20:52 -0400 |
commit | bfed345edfe05b291f7e5d396d4b447b6e8e66fa (patch) | |
tree | b0d2c26465b60be1d47bb2b36b7aebd742ea885a | |
parent | c984c2638501e9bdb23438e61b922e3234959fac (diff) |
mmc: sdhci-pxa: move platform data to include/linux/platform_data
As suggested by Arnd, move platform data to include/linux/platform_data
in order to improve build coverage for the driver.
Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
-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 @@ | |||
1 | #ifndef __ASM_MACH_MMP2_H | 1 | #ifndef __ASM_MACH_MMP2_H |
2 | #define __ASM_MACH_MMP2_H | 2 | #define __ASM_MACH_MMP2_H |
3 | 3 | ||
4 | #include <plat/sdhci.h> | 4 | #include <linux/platform_data/pxa_sdhci.h> |
5 | 5 | ||
6 | struct sys_timer; | 6 | struct sys_timer; |
7 | 7 | ||
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 @@ | |||
25 | #include <linux/gpio.h> | 25 | #include <linux/gpio.h> |
26 | #include <linux/mmc/card.h> | 26 | #include <linux/mmc/card.h> |
27 | #include <linux/mmc/host.h> | 27 | #include <linux/mmc/host.h> |
28 | #include <plat/sdhci.h> | 28 | #include <linux/platform_data/pxa_sdhci.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include "sdhci.h" | 30 | #include "sdhci.h" |
31 | #include "sdhci-pltfm.h" | 31 | #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 @@ | |||
24 | #include <linux/gpio.h> | 24 | #include <linux/gpio.h> |
25 | #include <linux/mmc/card.h> | 25 | #include <linux/mmc/card.h> |
26 | #include <linux/mmc/host.h> | 26 | #include <linux/mmc/host.h> |
27 | #include <plat/sdhci.h> | 27 | #include <linux/platform_data/pxa_sdhci.h> |
28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
30 | #include "sdhci.h" | 30 | #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 @@ | |||
1 | /* linux/arch/arm/plat-pxa/include/plat/sdhci.h | 1 | /* |
2 | * include/linux/platform_data/pxa_sdhci.h | ||
2 | * | 3 | * |
3 | * Copyright 2010 Marvell | 4 | * Copyright 2010 Marvell |
4 | * Zhangfei Gao <zhangfei.gao@marvell.com> | 5 | * Zhangfei Gao <zhangfei.gao@marvell.com> |
@@ -10,8 +11,8 @@ | |||
10 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
11 | */ | 12 | */ |
12 | 13 | ||
13 | #ifndef __PLAT_PXA_SDHCI_H | 14 | #ifndef _PXA_SDHCI_H_ |
14 | #define __PLAT_PXA_SDHCI_H | 15 | #define _PXA_SDHCI_H_ |
15 | 16 | ||
16 | /* pxa specific flag */ | 17 | /* pxa specific flag */ |
17 | /* Require clock free running */ | 18 | /* Require clock free running */ |
@@ -56,5 +57,4 @@ struct sdhci_pxa { | |||
56 | u8 clk_enable; | 57 | u8 clk_enable; |
57 | u8 power_mode; | 58 | u8 power_mode; |
58 | }; | 59 | }; |
59 | 60 | #endif /* _PXA_SDHCI_H_ */ | |
60 | #endif /* __PLAT_PXA_SDHCI_H */ | ||