diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/isdn/hisax/st5481_init.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/isdn/hisax/st5481_init.c')
| -rw-r--r-- | drivers/isdn/hisax/st5481_init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/st5481_init.c b/drivers/isdn/hisax/st5481_init.c index 2cf5d1a6df6c..8e192a3a3490 100644 --- a/drivers/isdn/hisax/st5481_init.c +++ b/drivers/isdn/hisax/st5481_init.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | 27 | #include <linux/config.h> |
| 28 | #include <linux/version.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/usb.h> | 30 | #include <linux/usb.h> |