1 files changed, 5 insertions, 8 deletions

diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 5efa84749f37..45fb2c3bcf82 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -204,13 +204,6 @@ static struct platform_device udc_device = {
         }
 };
 
-static struct pxafb_mach_info pxa_fb_info;
-
-void __init set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info)
-{
-        memcpy(&pxa_fb_info,hard_pxa_fb_info,sizeof(struct pxafb_mach_info));
-}
-
 static struct resource pxafb_resources[] = {
         [0] = {
                 .start  = 0x44000000,
@@ -230,7 +223,6 @@ static struct platform_device pxafb_device = {
         .name           = "pxa2xx-fb",
         .id             = -1,
         .dev            = {
-                .platform_data  = &pxa_fb_info,
                 .dma_mask       = &fb_dma_mask,
                 .coherent_dma_mask = 0xffffffff,
         },
@@ -238,6 +230,11 @@ static struct platform_device pxafb_device = {
         .resource       = pxafb_resources,
 };
 
+void __init set_pxa_fb_info(struct pxafb_mach_info *info)
+{
+        pxafb_device.dev.platform_data = info;
+}
+
 void __init set_pxa_fb_parent(struct device *parent_dev)
 {
         pxafb_device.dev.parent = parent_dev;