diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
| commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
| tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/linux/isdn.h | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/isdn.h')
| -rw-r--r-- | include/linux/isdn.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/isdn.h b/include/linux/isdn.h index 53eaee96065b..62991148d5a5 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h | |||
| @@ -146,7 +146,6 @@ typedef struct { | |||
| 146 | 146 | ||
| 147 | #ifdef __KERNEL__ | 147 | #ifdef __KERNEL__ |
| 148 | 148 | ||
| 149 | #include <linux/config.h> | ||
| 150 | #include <linux/errno.h> | 149 | #include <linux/errno.h> |
| 151 | #include <linux/fs.h> | 150 | #include <linux/fs.h> |
| 152 | #include <linux/major.h> | 151 | #include <linux/major.h> |