Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38068
b: refs/heads/master
c: 86702ad
h: refs/heads/master
v: v3
  • Loading branch information
Michal Piotrowski authored and Linus Torvalds committed Oct 3, 2006
1 parent c8baa69 commit 5c764c7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4370409a924b5e065f9f0905d243ab69a95b52f4
refs/heads/master: 86702ad483fa50e09f9535a0e5d2ecad2202facc
2 changes: 0 additions & 2 deletions trunk/drivers/video/sis/vgatypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,10 @@ typedef unsigned int BOOLEAN;

#ifdef SIS_LINUX_KERNEL
typedef unsigned long SISIOADDRESS;
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
#include <linux/types.h> /* Need __iomem */
#undef SISIOMEMTYPE
#define SISIOMEMTYPE __iomem
#endif
#endif

#ifdef SIS_XORG_XF86
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)
Expand Down

0 comments on commit 5c764c7

Please sign in to comment.