summaryrefslogtreecommitdiff
path: root/include/video/neomagic.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-21 15:28:24 +0400
committerIngo Molnar <mingo@elte.hu>2008-08-21 15:28:24 +0400
commit470fba7ebe60ad9185056b080b331abad24b4df9 (patch)
treef83bc13d97adaf5dd0e0f1d6a157b890f868577f /include/video/neomagic.h
parent7225e75144b9718cbbe1820d9c011c809d5773fd (diff)
parent6a55617ed5d1aa62b850de2cf66f5ede2eef4825 (diff)
downloadlinux-470fba7ebe60ad9185056b080b331abad24b4df9.tar.xz
Merge branch 'linus' into x86/doc
Diffstat (limited to 'include/video/neomagic.h')
-rw-r--r--include/video/neomagic.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/include/video/neomagic.h b/include/video/neomagic.h
index a9e118a1cd16..38910da0ae59 100644
--- a/include/video/neomagic.h
+++ b/include/video/neomagic.h
@@ -90,23 +90,6 @@
#define PCI_CHIP_NM2360 0x0006
#define PCI_CHIP_NM2380 0x0016
-
-struct xtimings {
- unsigned int pixclock;
- unsigned int HDisplay;
- unsigned int HSyncStart;
- unsigned int HSyncEnd;
- unsigned int HTotal;
- unsigned int VDisplay;
- unsigned int VSyncStart;
- unsigned int VSyncEnd;
- unsigned int VTotal;
- unsigned int sync;
- int dblscan;
- int interlaced;
-};
-
-
/* --------------------------------------------------------------------- */
typedef volatile struct {