diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-26 06:03:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-26 06:03:03 -0400 |
| commit | 938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e (patch) | |
| tree | 9257bdba52ce88ca0a0c2f6fce1f59a1eb278452 /arch/arm/mach-pxa/zeus.c | |
| parent | 16c29dafcc86024048f1dbb8349d31cb22c7c55a (diff) | |
| parent | 5898eb79fb45d4fd4ce22139c168de937bfaab38 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/tosa.c
Diffstat (limited to 'arch/arm/mach-pxa/zeus.c')
| -rw-r--r-- | arch/arm/mach-pxa/zeus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c index 730f51e57c17..5891590126f7 100644 --- a/arch/arm/mach-pxa/zeus.c +++ b/arch/arm/mach-pxa/zeus.c | |||
| @@ -846,7 +846,7 @@ static void __init zeus_init(void) | |||
| 846 | if (zeus_setup_fb_gpios()) | 846 | if (zeus_setup_fb_gpios()) |
| 847 | pr_err("Failed to setup fb gpios\n"); | 847 | pr_err("Failed to setup fb gpios\n"); |
| 848 | else | 848 | else |
| 849 | set_pxa_fb_info(&zeus_fb_info); | 849 | pxa_set_fb_info(NULL, &zeus_fb_info); |
| 850 | 850 | ||
| 851 | pxa_set_mci_info(&zeus_mci_platform_data); | 851 | pxa_set_mci_info(&zeus_mci_platform_data); |
| 852 | pxa_set_udc_info(&zeus_udc_info); | 852 | pxa_set_udc_info(&zeus_udc_info); |