git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-pxa
/
idp.c
diff --git
a/arch/arm/mach-pxa/idp.c
b/arch/arm/mach-pxa/idp.c
index
6914d22
..
64df440
100644
(file)
--- a/
arch/arm/mach-pxa/idp.c
+++ b/
arch/arm/mach-pxa/idp.c
@@
-82,7
+82,7
@@
static void idp_vlcd(int on)
}
}
}
}
-static void idp_lcd_power(int on)
+static void idp_lcd_power(int on
, struct fb_var_screeninfo *var
)
{
if (on) {
IDP_CPLD_LCD |= (1<<0);
{
if (on) {
IDP_CPLD_LCD |= (1<<0);
@@
-99,7
+99,7
@@
static void idp_lcd_power(int on)
idp_vlcd(on);
}
idp_vlcd(on);
}
-static struct pxafb_m
ach_info sharp_lm8v31 __initdata
= {
+static struct pxafb_m
ode_info sharp_lm8v31_mode
= {
.pixclock = 270000,
.xres = 640,
.yres = 480,
.pixclock = 270000,
.xres = 640,
.yres = 480,
@@
-112,6
+112,11
@@
static struct pxafb_mach_info sharp_lm8v31 __initdata = {
.lower_margin = 0,
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
.cmap_greyscale = 0,
.lower_margin = 0,
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
.cmap_greyscale = 0,
+};
+
+static struct pxafb_mach_info sharp_lm8v31 = {
+ .modes = &sharp_lm8v31_mode,
+ .num_modes = 1,
.cmap_inverse = 0,
.cmap_static = 0,
.lccr0 = LCCR0_SDS,
.cmap_inverse = 0,
.cmap_static = 0,
.lccr0 = LCCR0_SDS,
@@
-120,7
+125,7
@@
static struct pxafb_mach_info sharp_lm8v31 __initdata = {
.pxafb_lcd_power = &idp_lcd_power
};
.pxafb_lcd_power = &idp_lcd_power
};
-static int idp_mci_init(struct device *dev, irq
return_t (*idp_detect_int)(int, void *, struct pt_regs *)
, void *data)
+static int idp_mci_init(struct device *dev, irq
_handler_t idp_detect_int
, void *data)
{
/* setup GPIO for PXA25x MMC controller */
pxa_gpio_mode(GPIO6_MMCCLK_MD);
{
/* setup GPIO for PXA25x MMC controller */
pxa_gpio_mode(GPIO6_MMCCLK_MD);