diff options
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r-- | arch/arm/mach-davinci/board-da830-evm.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 537a048c84be..e7f24169e2f5 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c | |||
@@ -433,8 +433,8 @@ static struct at24_platform_data da830_evm_i2c_eeprom_info = { | |||
433 | .context = (void *)0x7f00, | 433 | .context = (void *)0x7f00, |
434 | }; | 434 | }; |
435 | 435 | ||
436 | static int da830_evm_ui_expander_setup(struct i2c_client *client, int gpio, | 436 | static int __init da830_evm_ui_expander_setup(struct i2c_client *client, |
437 | unsigned ngpio, void *context) | 437 | int gpio, unsigned ngpio, void *context) |
438 | { | 438 | { |
439 | gpio_request(gpio + 6, "UI MUX_MODE"); | 439 | gpio_request(gpio + 6, "UI MUX_MODE"); |
440 | 440 | ||
@@ -455,7 +455,7 @@ static int da830_evm_ui_expander_teardown(struct i2c_client *client, int gpio, | |||
455 | return 0; | 455 | return 0; |
456 | } | 456 | } |
457 | 457 | ||
458 | static struct pcf857x_platform_data da830_evm_ui_expander_info = { | 458 | static struct pcf857x_platform_data __initdata da830_evm_ui_expander_info = { |
459 | .gpio_base = DAVINCI_N_GPIO, | 459 | .gpio_base = DAVINCI_N_GPIO, |
460 | .setup = da830_evm_ui_expander_setup, | 460 | .setup = da830_evm_ui_expander_setup, |
461 | .teardown = da830_evm_ui_expander_teardown, | 461 | .teardown = da830_evm_ui_expander_teardown, |
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 19eb0479d26d..529e47215e0b 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c | |||
@@ -176,7 +176,7 @@ static u32 ui_card_detected; | |||
176 | #define HAS_MMC 0 | 176 | #define HAS_MMC 0 |
177 | #endif | 177 | #endif |
178 | 178 | ||
179 | static void da850_evm_setup_nor_nand(void) | 179 | static __init void da850_evm_setup_nor_nand(void) |
180 | { | 180 | { |
181 | int ret = 0; | 181 | int ret = 0; |
182 | 182 | ||