diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/net/irda | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/ks959-sir.c | 1 | ||||
| -rw-r--r-- | drivers/net/irda/ksdazzle-sir.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c index f59d5b6b7bfe..600d96f9cdb7 100644 --- a/drivers/net/irda/ks959-sir.c +++ b/drivers/net/irda/ks959-sir.c | |||
| @@ -118,7 +118,6 @@ | |||
| 118 | #include <linux/errno.h> | 118 | #include <linux/errno.h> |
| 119 | #include <linux/init.h> | 119 | #include <linux/init.h> |
| 120 | #include <linux/slab.h> | 120 | #include <linux/slab.h> |
| 121 | #include <linux/module.h> | ||
| 122 | #include <linux/kref.h> | 121 | #include <linux/kref.h> |
| 123 | #include <linux/usb.h> | 122 | #include <linux/usb.h> |
| 124 | #include <linux/device.h> | 123 | #include <linux/device.h> |
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c index 6c39f3f6d4e6..0e7f89337b25 100644 --- a/drivers/net/irda/ksdazzle-sir.c +++ b/drivers/net/irda/ksdazzle-sir.c | |||
| @@ -82,7 +82,6 @@ | |||
| 82 | #include <linux/errno.h> | 82 | #include <linux/errno.h> |
| 83 | #include <linux/init.h> | 83 | #include <linux/init.h> |
| 84 | #include <linux/slab.h> | 84 | #include <linux/slab.h> |
| 85 | #include <linux/module.h> | ||
| 86 | #include <linux/kref.h> | 85 | #include <linux/kref.h> |
| 87 | #include <linux/usb.h> | 86 | #include <linux/usb.h> |
| 88 | #include <linux/device.h> | 87 | #include <linux/device.h> |