Merge branch 'stable/for-linus-3.6' into linux-next

[karo-tx-linux.git] / drivers / staging / xgifb / XGIfb.h

diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h
index 9068c5ad76ec3004d4f36f908691c44966ef0af8..80547983759b01639b5ba8d7533ee12532ef8e84 100644 (file)
--- a/drivers/staging/xgifb/XGIfb.h
+++ b/drivers/staging/xgifb/XGIfb.h
@@ -1,8 +1,5 @@
 #ifndef _LINUX_XGIFB
 #define _LINUX_XGIFB
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
 #include "vgatypes.h"
 #include "vb_struct.h"
 
@@ -33,13 +30,13 @@ enum xgi_tvtype {
        TVMODE_NTSC = 0,
        TVMODE_PAL,
        TVMODE_HIVISION,
-       TVTYPE_PALM,    /* vicki@030226 */
-       TVTYPE_PALN,    /* vicki@030226 */
-       TVTYPE_NTSCJ,   /* vicki@030226 */
+       TVTYPE_PALM,
+       TVTYPE_PALN,
+       TVTYPE_NTSCJ,
        TVMODE_TOTAL
 };
 
-enum xgi_tv_plug { /* vicki@030226 */
+enum xgi_tv_plug {
        TVPLUG_UNKNOWN = 0,
        TVPLUG_COMPOSITE = 1,
        TVPLUG_SVIDEO = 2,