Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/video/geode/lxfb.h b/drivers/video/geode/lxfb.h
index 6a51448fd3f7..e4c4d89b7860 100644
--- a/drivers/video/geode/lxfb.h
+++ b/drivers/video/geode/lxfb.h
@@ -1,3 +1,13 @@
+/* Geode LX framebuffer driver
+ *
+ * Copyright (C) 2006-2007, Advanced Micro Devices,Inc.
+ * Copyright (c) 2008  Andres Salomon <dilinger@debian.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
 #ifndef _LXFB_H_
 #define _LXFB_H_
 
@@ -355,6 +365,8 @@ enum fp_registers {
         FP_CRC, /* 0x458 */
 };
 
+#define FP_PT2_HSP                      (1 << 22)
+#define FP_PT2_VSP                      (1 << 23)
 #define FP_PT2_SCRC                     (1 << 27)       /* shfclk free */
 
 #define FP_PM_P                         (1 << 24)       /* panel power ctl */
@@ -409,7 +421,7 @@ static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val)
 }
 
 
-/* MSRs are defined in asm/geode.h; their bitfields are here */
+/* MSRs are defined in linux/cs5535.h; their bitfields are here */
 
 #define MSR_GLCP_DOTPLL_LOCK            (1 << 25)       /* r/o */
 #define MSR_GLCP_DOTPLL_HALFPIX         (1 << 24)