summaryrefslogtreecommitdiffstats
path: root/drivers/video/pxafb.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-02 23:07:40 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-02 23:07:40 +0100
commitc5b84b3bb0c055d70dc9f1b5e900378bc9d059ea (patch)
treebd5b0b4efb552bacd812f9e6e08a29bae70c0da1 /drivers/video/pxafb.h
parent[ARM] fix missing includes for iop33x and sa1100_ir (diff)
parent[ARM] pxa: add basic support for HP iPAQ h5000 (diff)
downloadlinux-c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea.tar.xz
linux-c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea.zip
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts: arch/arm/mach-pxa/pxa25x.c
Diffstat (limited to 'drivers/video/pxafb.h')
-rw-r--r--drivers/video/pxafb.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h
index 31541b86f13d..d8eb93fa03a3 100644
--- a/drivers/video/pxafb.h
+++ b/drivers/video/pxafb.h
@@ -124,6 +124,9 @@ struct pxafb_info {
struct notifier_block freq_transition;
struct notifier_block freq_policy;
#endif
+
+ void (*lcd_power)(int, struct fb_var_screeninfo *);
+ void (*backlight_power)(int);
};
#define TO_INF(ptr,member) container_of(ptr,struct pxafb_info,member)