diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/connector | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/connector')
| -rw-r--r-- | drivers/connector/cn_proc.c | 1 | ||||
| -rw-r--r-- | drivers/connector/connector.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index 60697909ebdb..a7f046b0096c 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/ktime.h> | 27 | #include <linux/ktime.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/connector.h> | 29 | #include <linux/connector.h> |
| 30 | #include <linux/gfp.h> | ||
| 30 | #include <asm/atomic.h> | 31 | #include <asm/atomic.h> |
| 31 | #include <asm/unaligned.h> | 32 | #include <asm/unaligned.h> |
| 32 | 33 | ||
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index 537c29ac4487..1d48f40342cb 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/netlink.h> | 26 | #include <linux/netlink.h> |
| 27 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 28 | #include <linux/connector.h> | 28 | #include <linux/connector.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
| 30 | #include <linux/proc_fs.h> | 31 | #include <linux/proc_fs.h> |
| 31 | #include <linux/spinlock.h> | 32 | #include <linux/spinlock.h> |