diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /drivers/net/irda | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
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 2482d61662a2..2e67ae015d91 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 1e0de93fd618..3843b5faba8b 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> |