aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/idp.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-29 21:54:54 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-29 21:54:54 +0100
commitb43d151e9679a06df896ac3db65a9dca80040fed (patch)
treeac0b71ef0a28f795700d85a8c8e23ba3fb6eef30 /arch/arm/mach-pxa/idp.c
parentdfad549d98b60160547d1b8299051b9456c8da85 (diff)
parent5f183860d5007ec76ea36bfa6c36d66e37f0dbcf (diff)
downloadkernel_samsung_tuna-b43d151e9679a06df896ac3db65a9dca80040fed.zip
kernel_samsung_tuna-b43d151e9679a06df896ac3db65a9dca80040fed.tar.gz
kernel_samsung_tuna-b43d151e9679a06df896ac3db65a9dca80040fed.tar.bz2
Merge branches 'fixes' and 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/mach-pxa/idp.c')
-rw-r--r--arch/arm/mach-pxa/idp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index dd40e4a..f7fb64f 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -167,7 +167,7 @@ static void __init idp_init(void)
platform_device_register(&smc91x_device);
//platform_device_register(&mst_audio_device);
- set_pxa_fb_info(&sharp_lm8v31);
+ pxa_set_fb_info(NULL, &sharp_lm8v31);
pxa_set_mci_info(&idp_mci_platform_data);
}