diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /lib/kobject_uevent.c | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'lib/kobject_uevent.c')
| -rw-r--r-- | lib/kobject_uevent.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 5b6d7f6956b9..9fb6b86cf6b1 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c | |||
| @@ -15,11 +15,13 @@ | |||
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
| 18 | #include <linux/string.h> | ||
| 19 | #include <linux/kobject.h> | ||
| 20 | #include <linux/module.h> | ||
| 21 | |||
| 18 | #include <linux/socket.h> | 22 | #include <linux/socket.h> |
| 19 | #include <linux/skbuff.h> | 23 | #include <linux/skbuff.h> |
| 20 | #include <linux/netlink.h> | 24 | #include <linux/netlink.h> |
| 21 | #include <linux/string.h> | ||
| 22 | #include <linux/kobject.h> | ||
| 23 | #include <net/sock.h> | 25 | #include <net/sock.h> |
| 24 | 26 | ||
| 25 | 27 | ||