Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-pxa / sharpsl.h

diff --git a/include/asm-arm/arch-pxa/sharpsl.h b/include/asm-arm/arch-pxa/sharpsl.h
index 94cb4982af82e473d7a6985a53c4e8c9dcabd2f2..3b1d4a72d4d1f08f43058e2a428939ba4b484cdd 100644 (file)
--- a/include/asm-arm/arch-pxa/sharpsl.h
+++ b/include/asm-arm/arch-pxa/sharpsl.h
@@ -16,7 +16,7 @@ int corgi_ssp_max1111_get(unsigned long data);
  */
 
 struct corgits_machinfo {
-       unsigned long (*get_hsync_len)(void);
+       unsigned long (*get_hsync_invperiod)(void);
        void (*put_hsync)(void);
        void (*wait_hsync)(void);
 };
@@ -25,12 +25,6 @@ struct corgits_machinfo {
 /*
  * SharpSL Backlight
  */
-struct corgibl_machinfo {
-       int max_intensity;
-       int default_intensity;
-       int limit_mask;
-       void (*set_bl_intensity)(int intensity);
-};
 extern void corgibl_limit_intensity(int limit);