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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-arm
/
arch-pxa
/
spitz.h
diff --git
a/include/asm-arm/arch-pxa/spitz.h
b/include/asm-arm/arch-pxa/spitz.h
index
62e1fe4
..
4953dd3
100644
(file)
--- a/
include/asm-arm/arch-pxa/spitz.h
+++ b/
include/asm-arm/arch-pxa/spitz.h
@@
-15,6
+15,8
@@
#define __ASM_ARCH_SPITZ_H 1
#endif
#define __ASM_ARCH_SPITZ_H 1
#endif
+#include <linux/fb.h>
+
/* Spitz/Akita GPIOs */
#define SPITZ_GPIO_KEY_INT (0) /* Key Interrupt */
/* Spitz/Akita GPIOs */
#define SPITZ_GPIO_KEY_INT (0) /* Key Interrupt */
@@
-155,4
+157,4
@@
extern struct platform_device spitzscoop2_device;
extern struct platform_device spitzssp_device;
extern struct sharpsl_charger_machinfo spitz_pm_machinfo;
extern struct platform_device spitzssp_device;
extern struct sharpsl_charger_machinfo spitz_pm_machinfo;
-extern void spitz_lcd_power(int on);
+extern void spitz_lcd_power(int on
, struct fb_var_screeninfo *var
);