summaryrefslogtreecommitdiffstats
path: root/drivers/video/sis
diff options
context:
space:
mode:
authorRandy Dunlap2007-05-08 09:28:08 +0200
committerLinus Torvalds2007-05-08 20:15:07 +0200
commite63340ae6b6205fef26b40a75673d1c9c0c8bb90 (patch)
tree8d3212705515edec73c3936bb9e23c71d34a7b41 /drivers/video/sis
parentadd touch_all_softlockup_watchdogs() (diff)
downloadkernel-qcow2-linux-e63340ae6b6205fef26b40a75673d1c9c0c8bb90.tar.gz
kernel-qcow2-linux-e63340ae6b6205fef26b40a75673d1c9c0c8bb90.tar.xz
kernel-qcow2-linux-e63340ae6b6205fef26b40a75673d1c9c0c8bb90.zip
header cleaning: don't include smp_lock.h when not used
Remove includes of <linux/smp_lock.h> where it is not used/needed. Suggested by Al Viro. Builds cleanly on x86_64, i386, alpha, ia64, powerpc, sparc, sparc64, and arm (all 59 defconfigs). Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/sis')
-rw-r--r--drivers/video/sis/sis.h1
-rw-r--r--drivers/video/sis/sis_main.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index 7d5ee2145e21..b1826d3c5222 100644
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -51,7 +51,6 @@
#include <linux/ioctl32.h>
#define SIS_OLD_CONFIG_COMPAT
#else
-#include <linux/smp_lock.h>
#define SIS_NEW_CONFIG_COMPAT
#endif
#endif /* CONFIG_COMPAT */
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 01197d740217..6e094688a637 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -37,7 +37,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
-#include <linux/smp_lock.h>
#include <linux/spinlock.h>
#include <linux/errno.h>
#include <linux/string.h>