diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 15:14:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 15:14:39 -0500 |
| commit | 2058297d2d045cb57138c33b87cfabcc80e65186 (patch) | |
| tree | 7ccffd0e162cbd7471f643561e79f23abb989a62 /drivers/net/hamradio/baycom_ser_fdx.c | |
| parent | 150e6c67f4bf6ab51e62defc41bd19a2eefe5709 (diff) | |
| parent | 4b27e1bb442e964903f8a3fa6bdf33a602dc0941 (diff) | |
Merge branch 'for-linus' into for-2.6.33
Conflicts:
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/net/hamradio/baycom_ser_fdx.c')
| -rw-r--r-- | drivers/net/hamradio/baycom_ser_fdx.c | 1 |
1 files changed, 1 insertions, 0 deletions
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> |