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/em-x270.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/em-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index b411d7cbf5a1..f8a6e9d79a3a 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
| @@ -689,7 +689,7 @@ static struct pxafb_mach_info em_x270_lcd = { | |||
| 689 | 689 | ||
| 690 | static void __init em_x270_init_lcd(void) | 690 | static void __init em_x270_init_lcd(void) |
| 691 | { | 691 | { |
| 692 | set_pxa_fb_info(&em_x270_lcd); | 692 | pxa_set_fb_info(NULL, &em_x270_lcd); |
| 693 | } | 693 | } |
| 694 | #else | 694 | #else |
| 695 | static inline void em_x270_init_lcd(void) {} | 695 | static inline void em_x270_init_lcd(void) {} |