aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sis/sis.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-25 06:58:56 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-25 06:58:56 +0900
commite5fa506173a6ed1ca8d78ba1e390cfdebc2fd49a (patch)
tree3dfa1f28f26f3b89ee13715284c15d8b0e80afa0 /drivers/video/sis/sis.h
parent3070fb888be52c5488976828ffc9f950872ffadc (diff)
parentc07a1c6b0fc6408efda7b7f5d12f24a3eda6a5e8 (diff)
downloadmrst-s0i3-test-e5fa506173a6ed1ca8d78ba1e390cfdebc2fd49a.tar.gz
mrst-s0i3-test-e5fa506173a6ed1ca8d78ba1e390cfdebc2fd49a.tar.xz
mrst-s0i3-test-e5fa506173a6ed1ca8d78ba1e390cfdebc2fd49a.zip
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: sisfb: delete osdef.h sisfb: move the CONFIG warning to sis_main.c sisfb: replace SiS_SetMemory with memset_io sisfb: remove InPort/OutPort wrappers sisfb: use CONFIG_FB_SIS_301/315 instead of SIS301/315H sisfb: delete redudant #define SIS_LINUX_KERNEL sisfb: delete dead SIS_XORG_XF86 code sisfb: delete fallback code for pci_map_rom() sisfb: delete obsolete PCI ROM bug workaround fbdev: Update documentation index file. lxfb: Program panel v/h sync output polarity correctly fbcmap: integer overflow bug fbcmap: cleanup white space in fb_alloc_cmap() MAINTAINERS: Add fbdev patchwork entry, tidy up file patterns. fbdev: da8xx: punt duplicated FBIO_WAITFORVSYNC define fbdev: sh_mobile_lcdcfb: fix bug in reconfig()
Diffstat (limited to 'drivers/video/sis/sis.h')
-rw-r--r--drivers/video/sis/sis.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index 7c5710e3fb5..80d89d37c41 100644
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -24,7 +24,6 @@
#ifndef _SIS_H_
#define _SIS_H_
-#include "osdef.h"
#include <video/sisfb.h>
#include "vgatypes.h"