diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-imx/clock.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-imx/generic.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mx1ads.c | 4 | ||||
-rw-r--r-- | arch/arm/mm/Kconfig | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/clock.c b/arch/arm/mach-imx/clock.c index 6a90fe5578df..8915a5fc63cd 100644 --- a/arch/arm/mach-imx/clock.c +++ b/arch/arm/mach-imx/clock.c | |||
@@ -172,24 +172,29 @@ found: | |||
172 | 172 | ||
173 | return clk; | 173 | return clk; |
174 | } | 174 | } |
175 | EXPORT_SYMBOL(clk_get); | ||
175 | 176 | ||
176 | void clk_put(struct clk *clk) | 177 | void clk_put(struct clk *clk) |
177 | { | 178 | { |
178 | } | 179 | } |
180 | EXPORT_SYMBOL(clk_put); | ||
179 | 181 | ||
180 | int clk_enable(struct clk *clk) | 182 | int clk_enable(struct clk *clk) |
181 | { | 183 | { |
182 | return 0; | 184 | return 0; |
183 | } | 185 | } |
186 | EXPORT_SYMBOL(clk_enable); | ||
184 | 187 | ||
185 | void clk_disable(struct clk *clk) | 188 | void clk_disable(struct clk *clk) |
186 | { | 189 | { |
187 | } | 190 | } |
191 | EXPORT_SYMBOL(clk_disable); | ||
188 | 192 | ||
189 | unsigned long clk_get_rate(struct clk *clk) | 193 | unsigned long clk_get_rate(struct clk *clk) |
190 | { | 194 | { |
191 | return clk->get_rate(); | 195 | return clk->get_rate(); |
192 | } | 196 | } |
197 | EXPORT_SYMBOL(clk_get_rate); | ||
193 | 198 | ||
194 | int imx_clocks_init(void) | 199 | int imx_clocks_init(void) |
195 | { | 200 | { |
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c index 98ddd8a6d05f..c40650dcddf5 100644 --- a/arch/arm/mach-imx/generic.c +++ b/arch/arm/mach-imx/generic.c | |||
@@ -251,7 +251,6 @@ void __init set_imx_fb_info(struct imxfb_mach_info *hard_imx_fb_info) | |||
251 | { | 251 | { |
252 | memcpy(&imx_fb_info,hard_imx_fb_info,sizeof(struct imxfb_mach_info)); | 252 | memcpy(&imx_fb_info,hard_imx_fb_info,sizeof(struct imxfb_mach_info)); |
253 | } | 253 | } |
254 | EXPORT_SYMBOL(set_imx_fb_info); | ||
255 | 254 | ||
256 | static struct resource imxfb_resources[] = { | 255 | static struct resource imxfb_resources[] = { |
257 | [0] = { | 256 | [0] = { |
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c index 9635d5812bcd..baeff24ff02d 100644 --- a/arch/arm/mach-imx/mx1ads.c +++ b/arch/arm/mach-imx/mx1ads.c | |||
@@ -125,7 +125,7 @@ static struct platform_device *devices[] __initdata = { | |||
125 | &imx_uart2_device, | 125 | &imx_uart2_device, |
126 | }; | 126 | }; |
127 | 127 | ||
128 | #ifdef CONFIG_MMC_IMX | 128 | #if defined(CONFIG_MMC_IMX) || defined(CONFIG_MMC_IMX_MODULE) |
129 | static int mx1ads_mmc_card_present(struct device *dev) | 129 | static int mx1ads_mmc_card_present(struct device *dev) |
130 | { | 130 | { |
131 | /* MMC/SD Card Detect is PB 20 on MX1ADS V1.0.7 */ | 131 | /* MMC/SD Card Detect is PB 20 on MX1ADS V1.0.7 */ |
@@ -143,7 +143,7 @@ mx1ads_init(void) | |||
143 | #ifdef CONFIG_LEDS | 143 | #ifdef CONFIG_LEDS |
144 | imx_gpio_mode(GPIO_PORTA | GPIO_OUT | 2); | 144 | imx_gpio_mode(GPIO_PORTA | GPIO_OUT | 2); |
145 | #endif | 145 | #endif |
146 | #ifdef CONFIG_MMC_IMX | 146 | #if defined(CONFIG_MMC_IMX) || defined(CONFIG_MMC_IMX_MODULE) |
147 | /* SD/MMC card detect */ | 147 | /* SD/MMC card detect */ |
148 | imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN | 20); | 148 | imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN | 20); |
149 | imx_set_mmc_info(&mx1ads_mmc_info); | 149 | imx_set_mmc_info(&mx1ads_mmc_info); |
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 3a6c8ec34cd9..399d1d66bf93 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -187,7 +187,7 @@ config CPU_ARM926T | |||
187 | ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \ | 187 | ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \ |
188 | ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \ | 188 | ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \ |
189 | ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \ | 189 | ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \ |
190 | ARCH_NS9XXX || ARCH_DAVINCI | 190 | ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2 |
191 | default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \ | 191 | default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \ |
192 | ARCH_OMAP730 || ARCH_OMAP16XX || \ | 192 | ARCH_OMAP730 || ARCH_OMAP16XX || \ |
193 | ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \ | 193 | ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \ |