diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
| commit | 3505d1a9fd65e2d3e00827857b6795d9d8983658 (patch) | |
| tree | 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5 /drivers/net/hamradio | |
| parent | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (diff) | |
| parent | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/baycom_epp.c | 1 | ||||
| -rw-r--r-- | drivers/net/hamradio/baycom_ser_fdx.c | 1 | ||||
| -rw-r--r-- | drivers/net/hamradio/baycom_ser_hdx.c | 1 | ||||
| -rw-r--r-- | drivers/net/hamradio/hdlcdrv.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index b3cf95d76040..a3c0dc9d8b98 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/module.h> | 44 | #include <linux/module.h> |
| 45 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
| 46 | #include <linux/init.h> | 46 | #include <linux/init.h> |
| 47 | #include <linux/sched.h> | ||
| 47 | #include <linux/string.h> | 48 | #include <linux/string.h> |
| 48 | #include <linux/workqueue.h> | 49 | #include <linux/workqueue.h> |
| 49 | #include <linux/fs.h> | 50 | #include <linux/fs.h> |
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c index aa4488e871b2..ed60fd664273 100644 --- a/drivers/net/hamradio/baycom_ser_fdx.c +++ b/drivers/net/hamradio/baycom_ser_fdx.c | |||
| @@ -71,6 +71,7 @@ | |||
| 71 | 71 | ||
| 72 | /*****************************************************************************/ | 72 | /*****************************************************************************/ |
| 73 | 73 | ||
| 74 | #include <linux/capability.h> | ||
| 74 | #include <linux/module.h> | 75 | #include <linux/module.h> |
| 75 | #include <linux/ioport.h> | 76 | #include <linux/ioport.h> |
| 76 | #include <linux/string.h> | 77 | #include <linux/string.h> |
diff --git a/drivers/net/hamradio/baycom_ser_hdx.c b/drivers/net/hamradio/baycom_ser_hdx.c index 88c593596020..1686f6dcbbce 100644 --- a/drivers/net/hamradio/baycom_ser_hdx.c +++ b/drivers/net/hamradio/baycom_ser_hdx.c | |||
| @@ -61,6 +61,7 @@ | |||
| 61 | 61 | ||
| 62 | /*****************************************************************************/ | 62 | /*****************************************************************************/ |
| 63 | 63 | ||
| 64 | #include <linux/capability.h> | ||
| 64 | #include <linux/module.h> | 65 | #include <linux/module.h> |
| 65 | #include <linux/ioport.h> | 66 | #include <linux/ioport.h> |
| 66 | #include <linux/string.h> | 67 | #include <linux/string.h> |
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index 0013c409782c..91c5790c9581 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | 42 | ||
| 43 | /*****************************************************************************/ | 43 | /*****************************************************************************/ |
| 44 | 44 | ||
| 45 | #include <linux/capability.h> | ||
| 45 | #include <linux/module.h> | 46 | #include <linux/module.h> |
| 46 | #include <linux/types.h> | 47 | #include <linux/types.h> |
| 47 | #include <linux/net.h> | 48 | #include <linux/net.h> |