diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261_devices.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 629ea5fc95cf..b2a34740146a 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c | |||
@@ -465,7 +465,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) | |||
465 | 465 | ||
466 | #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) | 466 | #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) |
467 | static u64 lcdc_dmamask = DMA_BIT_MASK(32); | 467 | static u64 lcdc_dmamask = DMA_BIT_MASK(32); |
468 | static struct atmel_lcdfb_info lcdc_data; | 468 | static struct atmel_lcdfb_pdata lcdc_data; |
469 | 469 | ||
470 | static struct resource lcdc_resources[] = { | 470 | static struct resource lcdc_resources[] = { |
471 | [0] = { | 471 | [0] = { |
@@ -498,7 +498,7 @@ static struct platform_device at91_lcdc_device = { | |||
498 | .num_resources = ARRAY_SIZE(lcdc_resources), | 498 | .num_resources = ARRAY_SIZE(lcdc_resources), |
499 | }; | 499 | }; |
500 | 500 | ||
501 | void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | 501 | void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) |
502 | { | 502 | { |
503 | if (!data) { | 503 | if (!data) { |
504 | return; | 504 | return; |
@@ -559,7 +559,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | |||
559 | platform_device_register(&at91_lcdc_device); | 559 | platform_device_register(&at91_lcdc_device); |
560 | } | 560 | } |
561 | #else | 561 | #else |
562 | void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {} | 562 | void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {} |
563 | #endif | 563 | #endif |
564 | 564 | ||
565 | 565 | ||