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/pcmcia/au1000_pb1x00.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/pcmcia/au1000_pb1x00.c')
| -rw-r--r-- | drivers/pcmcia/au1000_pb1x00.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c index d414a3bb50b9..86c0808d6a05 100644 --- a/drivers/pcmcia/au1000_pb1x00.c +++ b/drivers/pcmcia/au1000_pb1x00.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/timer.h> | 30 | #include <linux/timer.h> |
| 31 | #include <linux/mm.h> | 31 | #include <linux/mm.h> |
| 32 | #include <linux/proc_fs.h> | 32 | #include <linux/proc_fs.h> |
| 33 | #include <linux/version.h> | ||
| 34 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 35 | 34 | ||
| 36 | #include <pcmcia/cs_types.h> | 35 | #include <pcmcia/cs_types.h> |