diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 11:15:50 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 11:15:50 -0700 |
| commit | 454abcc57f1d48a976291bc4af73b5f087e21d70 (patch) | |
| tree | 5bba999ea3f31527da02b60604531cc5fb52ea57 /arch/arm/mach-pxa/cm-x2xx.c | |
| parent | 88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff) | |
| parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) | |
| download | kernel_samsung_smdk4412-454abcc57f1d48a976291bc4af73b5f087e21d70.zip kernel_samsung_smdk4412-454abcc57f1d48a976291bc4af73b5f087e21d70.tar.gz kernel_samsung_smdk4412-454abcc57f1d48a976291bc4af73b5f087e21d70.tar.bz2 | |
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'arch/arm/mach-pxa/cm-x2xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x2xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c index b734d84..8225e2e 100644 --- a/arch/arm/mach-pxa/cm-x2xx.c +++ b/arch/arm/mach-pxa/cm-x2xx.c @@ -379,7 +379,7 @@ __setup("monitor=", cmx2xx_set_display); static void __init cmx2xx_init_display(void) { - set_pxa_fb_info(cmx2xx_display); + pxa_set_fb_info(NULL, cmx2xx_display); } #else static inline void cmx2xx_init_display(void) {} |