diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /drivers/base/sys.c | |
parent | 55ee3b8365fd5d301b9076eea739146f2b91e82c (diff) | |
parent | 5028770a42e7bc4d15791a44c28f0ad539323807 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'drivers/base/sys.c')
-rw-r--r-- | drivers/base/sys.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/sys.c b/drivers/base/sys.c index f37a13de804a..214b96435409 100644 --- a/drivers/base/sys.c +++ b/drivers/base/sys.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/string.h> | 22 | #include <linux/string.h> |
23 | #include <linux/pm.h> | 23 | #include <linux/pm.h> |
24 | 24 | ||
25 | |||
26 | extern struct subsystem devices_subsys; | 25 | extern struct subsystem devices_subsys; |
27 | 26 | ||
28 | #define to_sysdev(k) container_of(k, struct sys_device, kobj) | 27 | #define to_sysdev(k) container_of(k, struct sys_device, kobj) |