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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
video
/
matrox
/
matroxfb_DAC1064.h
diff --git
a/drivers/video/matrox/matroxfb_DAC1064.h
b/drivers/video/matrox/matroxfb_DAC1064.h
index
56513a5
..
a6a4701
100644
(file)
--- a/
drivers/video/matrox/matroxfb_DAC1064.h
+++ b/
drivers/video/matrox/matroxfb_DAC1064.h
@@
-1,6
+1,7
@@
#ifndef __MATROXFB_DAC1064_H__
#define __MATROXFB_DAC1064_H__
#ifndef __MATROXFB_DAC1064_H__
#define __MATROXFB_DAC1064_H__
+/* make checkconfig does not walk through include tree */
#include <linux/config.h>
#include "matroxfb_base.h"
#include <linux/config.h>
#include "matroxfb_base.h"
@@
-40,7
+41,6
@@
void DAC1064_global_restore(WPMINFO2);
#define M1064_XCURCOL1RED 0x0C
#define M1064_XCURCOL1GREEN 0x0D
#define M1064_XCURCOL1BLUE 0x0E
#define M1064_XCURCOL1RED 0x0C
#define M1064_XCURCOL1GREEN 0x0D
#define M1064_XCURCOL1BLUE 0x0E
-#define M1064_XDVICLKCTRL 0x0F
#define M1064_XCURCOL2RED 0x10
#define M1064_XCURCOL2GREEN 0x11
#define M1064_XCURCOL2BLUE 0x12
#define M1064_XCURCOL2RED 0x10
#define M1064_XCURCOL2GREEN 0x11
#define M1064_XCURCOL2BLUE 0x12
@@
-145,7
+145,6
@@
void DAC1064_global_restore(WPMINFO2);
#define M1064_XVIDPLLN 0x8F
#define M1064_XPWRCTRL 0xA0
#define M1064_XVIDPLLN 0x8F
#define M1064_XPWRCTRL 0xA0
-#define M1064_XPWRCTRL_PANELPDN 0x04
#define M1064_XPANMODE 0xA2
#define M1064_XPANMODE 0xA2