diff options
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-paz00.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-trimslice.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/include/mach/sdhci.h | 30 |
4 files changed, 3 insertions, 33 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index e65e837f4013..5f428ff61fe9 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
27 | #include <linux/gpio.h> | 27 | #include <linux/gpio.h> |
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include <linux/platform_data/mmc-sdhci-tegra.h> | ||
29 | 30 | ||
30 | #include <sound/wm8903.h> | 31 | #include <sound/wm8903.h> |
31 | 32 | ||
@@ -38,7 +39,6 @@ | |||
38 | #include <mach/tegra_wm8903_pdata.h> | 39 | #include <mach/tegra_wm8903_pdata.h> |
39 | #include <mach/iomap.h> | 40 | #include <mach/iomap.h> |
40 | #include <mach/irqs.h> | 41 | #include <mach/irqs.h> |
41 | #include <mach/sdhci.h> | ||
42 | 42 | ||
43 | #include "board.h" | 43 | #include "board.h" |
44 | #include "board-harmony.h" | 44 | #include "board-harmony.h" |
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c index 4b64af5cab27..112bf683283b 100644 --- a/arch/arm/mach-tegra/board-paz00.c +++ b/arch/arm/mach-tegra/board-paz00.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/i2c.h> | 31 | #include <linux/i2c.h> |
32 | #include <linux/gpio.h> | 32 | #include <linux/gpio.h> |
33 | #include <linux/rfkill-gpio.h> | 33 | #include <linux/rfkill-gpio.h> |
34 | #include <linux/platform_data/mmc-sdhci-tegra.h> | ||
34 | 35 | ||
35 | #include <asm/hardware/gic.h> | 36 | #include <asm/hardware/gic.h> |
36 | #include <asm/mach-types.h> | 37 | #include <asm/mach-types.h> |
@@ -40,7 +41,6 @@ | |||
40 | 41 | ||
41 | #include <mach/iomap.h> | 42 | #include <mach/iomap.h> |
42 | #include <mach/irqs.h> | 43 | #include <mach/irqs.h> |
43 | #include <mach/sdhci.h> | ||
44 | 44 | ||
45 | #include "board.h" | 45 | #include "board.h" |
46 | #include "board-paz00.h" | 46 | #include "board-paz00.h" |
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index 776aa9564d5d..8d1a66a27e38 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
28 | #include <linux/gpio.h> | 28 | #include <linux/gpio.h> |
29 | #include <linux/platform_data/tegra_usb.h> | 29 | #include <linux/platform_data/tegra_usb.h> |
30 | #include <linux/platform_data/mmc-sdhci-tegra.h> | ||
30 | 31 | ||
31 | #include <asm/hardware/gic.h> | 32 | #include <asm/hardware/gic.h> |
32 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
@@ -34,7 +35,6 @@ | |||
34 | #include <asm/setup.h> | 35 | #include <asm/setup.h> |
35 | 36 | ||
36 | #include <mach/iomap.h> | 37 | #include <mach/iomap.h> |
37 | #include <mach/sdhci.h> | ||
38 | 38 | ||
39 | #include "board.h" | 39 | #include "board.h" |
40 | #include "clock.h" | 40 | #include "clock.h" |
diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/arch/arm/mach-tegra/include/mach/sdhci.h deleted file mode 100644 index 4231bc7b8652..000000000000 --- a/arch/arm/mach-tegra/include/mach/sdhci.h +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-tegra/include/mach/sdhci.h | ||
3 | * | ||
4 | * Copyright (C) 2009 Palm, Inc. | ||
5 | * Author: Yvonne Yip <y@palm.com> | ||
6 | * | ||
7 | * This software is licensed under the terms of the GNU General Public | ||
8 | * License version 2, as published by the Free Software Foundation, and | ||
9 | * may be copied, distributed, and modified under those terms. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | */ | ||
17 | #ifndef __ASM_ARM_ARCH_TEGRA_SDHCI_H | ||
18 | #define __ASM_ARM_ARCH_TEGRA_SDHCI_H | ||
19 | |||
20 | #include <linux/mmc/host.h> | ||
21 | |||
22 | struct tegra_sdhci_platform_data { | ||
23 | int cd_gpio; | ||
24 | int wp_gpio; | ||
25 | int power_gpio; | ||
26 | int is_8bit; | ||
27 | int pm_flags; | ||
28 | }; | ||
29 | |||
30 | #endif | ||