summaryrefslogtreecommitdiff
path: root/include/linux/sysdev.h
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-11-25 10:48:00 -0800
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-11-25 10:48:00 -0800
commit27f6cbecbf60e2dd2be49a945e9966ed6b20b2de (patch)
tree2416ab37445ec5ec8e669016a2d1f5573863d73c /include/linux/sysdev.h
parent7cf095f46f0ca52773a431db8ac0bf4a07a3501b (diff)
parenteb1852b10593dc3ca73e02bf9ac4753a5a464905 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next
Diffstat (limited to 'include/linux/sysdev.h')
-rw-r--r--include/linux/sysdev.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h
index d35e783a598c..20f63d3e6144 100644
--- a/include/linux/sysdev.h
+++ b/include/linux/sysdev.h
@@ -22,7 +22,6 @@
#define _SYSDEV_H_
#include <linux/kobject.h>
-#include <linux/module.h>
#include <linux/pm.h>