diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-10 00:29:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-10 00:29:47 -0400 |
| commit | f222e8b40f2177b1c4cac015b117744c1d3fa3e9 (patch) | |
| tree | 7c5fc22c08da900e21b0e7ab2376e8e8e44a63c0 /drivers/telephony/phonedev.c | |
| parent | 819ae6a389d4acfab9a7bb874fa1977aa464d14b (diff) | |
| parent | f4b9a988685da6386d7f9a72df3098bcc3270526 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/telephony/phonedev.c')
| -rw-r--r-- | drivers/telephony/phonedev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c index b52cc830c0b4..f3873f650bb4 100644 --- a/drivers/telephony/phonedev.c +++ b/drivers/telephony/phonedev.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 24 | #include <linux/phonedev.h> | 24 | #include <linux/phonedev.h> |
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/smp_lock.h> | ||
| 27 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
| 28 | #include <asm/system.h> | 27 | #include <asm/system.h> |
| 29 | 28 | ||