git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
raumfeld.c
diff --git
a/arch/arm/mach-pxa/raumfeld.c
b/arch/arm/mach-pxa/raumfeld.c
index
8361151
..
cd18613
100644
(file)
--- a/
arch/arm/mach-pxa/raumfeld.c
+++ b/
arch/arm/mach-pxa/raumfeld.c
@@
-32,6
+32,7
@@
#include <linux/sched.h>
#include <linux/pwm_backlight.h>
#include <linux/i2c.h>
#include <linux/sched.h>
#include <linux/pwm_backlight.h>
#include <linux/i2c.h>
+#include <linux/i2c/pxa-i2c.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
#include <linux/lis3lv02d.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
#include <linux/lis3lv02d.h>
@@
-53,7
+54,6
@@
#include <mach/ohci.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/ohci.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
-#include <plat/i2c.h>
#include <plat/pxa3xx_nand.h>
#include "generic.h"
#include <plat/pxa3xx_nand.h>
#include "generic.h"
@@
-597,7
+597,7
@@
static void __init raumfeld_lcd_init(void)
{
int ret;
{
int ret;
-
set_pxa_fb_info(
&raumfeld_sharp_lcd_info);
+
pxa_set_fb_info(NULL,
&raumfeld_sharp_lcd_info);
/* Earlier devices had the backlight regulator controlled
* via PWM, later versions use another controller for that */
/* Earlier devices had the backlight regulator controlled
* via PWM, later versions use another controller for that */