diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
commit | 2be7a906752abf8dce9350c23b6d1036049a5d3e (patch) | |
tree | ef178fa5801bdce24938819086662bb747d8c0c2 /drivers/pcmcia/pxa2xx_mainstone.c | |
parent | aaf8a7a2949481482200686c7bd3852e5be2e093 (diff) | |
parent | fbf1769d08a8b085834dceb228540153ac2cd534 (diff) |
Merge Paulus' tree
Diffstat (limited to 'drivers/pcmcia/pxa2xx_mainstone.c')
-rw-r--r-- | drivers/pcmcia/pxa2xx_mainstone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c index bbe69b07ce50..5209d8c7764f 100644 --- a/drivers/pcmcia/pxa2xx_mainstone.c +++ b/drivers/pcmcia/pxa2xx_mainstone.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
20 | #include <linux/device.h> | 20 | #include <linux/platform_device.h> |
21 | 21 | ||
22 | #include <pcmcia/ss.h> | 22 | #include <pcmcia/ss.h> |
23 | 23 | ||