diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/telephony/ixj.c | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'drivers/telephony/ixj.c')
| -rw-r--r-- | drivers/telephony/ixj.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index a913efc69669..40de151f2789 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c | |||
| @@ -257,6 +257,7 @@ | |||
| 257 | #include <linux/fs.h> /* everything... */ | 257 | #include <linux/fs.h> /* everything... */ |
| 258 | #include <linux/errno.h> /* error codes */ | 258 | #include <linux/errno.h> /* error codes */ |
| 259 | #include <linux/slab.h> | 259 | #include <linux/slab.h> |
| 260 | #include <linux/smp_lock.h> | ||
| 260 | #include <linux/mm.h> | 261 | #include <linux/mm.h> |
| 261 | #include <linux/ioport.h> | 262 | #include <linux/ioport.h> |
| 262 | #include <linux/interrupt.h> | 263 | #include <linux/interrupt.h> |