diff options
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/au1000_generic.h | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/au1000_pb1x00.c | 2 | ||||
| -rw-r--r-- | drivers/pcmcia/cistpl.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/cs.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/db1xxx_ss.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/ds.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/i82092.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/i82365.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/m32r_cfc.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/m32r_pcc.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/m8xx_pcmcia.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/pcmcia_cis.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/pd6729.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/rsrc_iodyn.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/rsrc_mgr.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/sa1100_generic.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/soc_common.h | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/socket_sysfs.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/tcic.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/xxs1500_ss.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/yenta_socket.c | 1 |
24 files changed, 0 insertions, 25 deletions
diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h index a324d329dea6..67530cefcf3c 100644 --- a/drivers/pcmcia/au1000_generic.h +++ b/drivers/pcmcia/au1000_generic.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | 23 | ||
| 24 | /* include the world */ | 24 | /* include the world */ |
| 25 | 25 | ||
| 26 | #include <pcmcia/cs_types.h> | ||
| 27 | #include <pcmcia/cs.h> | 26 | #include <pcmcia/cs.h> |
| 28 | #include <pcmcia/ss.h> | 27 | #include <pcmcia/ss.h> |
| 29 | #include <pcmcia/cistpl.h> | 28 | #include <pcmcia/cistpl.h> |
diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c index 5a979cb8f3e6..807f2d75dad3 100644 --- a/drivers/pcmcia/au1000_pb1x00.c +++ b/drivers/pcmcia/au1000_pb1x00.c | |||
| @@ -31,11 +31,9 @@ | |||
| 31 | #include <linux/proc_fs.h> | 31 | #include <linux/proc_fs.h> |
| 32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 33 | 33 | ||
| 34 | #include <pcmcia/cs_types.h> | ||
| 35 | #include <pcmcia/cs.h> | 34 | #include <pcmcia/cs.h> |
| 36 | #include <pcmcia/ss.h> | 35 | #include <pcmcia/ss.h> |
| 37 | #include <pcmcia/cistpl.h> | 36 | #include <pcmcia/cistpl.h> |
| 38 | #include <pcmcia/bus_ops.h> | ||
| 39 | 37 | ||
| 40 | #include <asm/io.h> | 38 | #include <asm/io.h> |
| 41 | #include <asm/irq.h> | 39 | #include <asm/irq.h> |
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index 8844bc3e3118..ba4a5acc2e9a 100644 --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <asm/byteorder.h> | 27 | #include <asm/byteorder.h> |
| 28 | #include <asm/unaligned.h> | 28 | #include <asm/unaligned.h> |
| 29 | 29 | ||
| 30 | #include <pcmcia/cs_types.h> | ||
| 31 | #include <pcmcia/ss.h> | 30 | #include <pcmcia/ss.h> |
| 32 | #include <pcmcia/cs.h> | 31 | #include <pcmcia/cs.h> |
| 33 | #include <pcmcia/cisreg.h> | 32 | #include <pcmcia/cisreg.h> |
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index efa30b84a75a..2ec8ac97445c 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <asm/system.h> | 32 | #include <asm/system.h> |
| 33 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
| 34 | 34 | ||
| 35 | #include <pcmcia/cs_types.h> | ||
| 36 | #include <pcmcia/ss.h> | 35 | #include <pcmcia/ss.h> |
| 37 | #include <pcmcia/cs.h> | 36 | #include <pcmcia/cs.h> |
| 38 | #include <pcmcia/cistpl.h> | 37 | #include <pcmcia/cistpl.h> |
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c index 0f4cc3f00028..27575e6378a1 100644 --- a/drivers/pcmcia/db1xxx_ss.c +++ b/drivers/pcmcia/db1xxx_ss.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
| 30 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 31 | 31 | ||
| 32 | #include <pcmcia/cs_types.h> | ||
| 33 | #include <pcmcia/ss.h> | 32 | #include <pcmcia/ss.h> |
| 34 | 33 | ||
| 35 | #include <asm/mach-au1x00/au1000.h> | 34 | #include <asm/mach-au1x00/au1000.h> |
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 08617719d3a1..bacfc55f2026 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/dma-mapping.h> | 26 | #include <linux/dma-mapping.h> |
| 27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
| 28 | 28 | ||
| 29 | #include <pcmcia/cs_types.h> | ||
| 30 | #include <pcmcia/cs.h> | 29 | #include <pcmcia/cs.h> |
| 31 | #include <pcmcia/cistpl.h> | 30 | #include <pcmcia/cistpl.h> |
| 32 | #include <pcmcia/ds.h> | 31 | #include <pcmcia/ds.h> |
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c index 3003bb3dfcc0..05d0879ce935 100644 --- a/drivers/pcmcia/i82092.c +++ b/drivers/pcmcia/i82092.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | 17 | ||
| 18 | #include <pcmcia/cs_types.h> | ||
| 19 | #include <pcmcia/ss.h> | 18 | #include <pcmcia/ss.h> |
| 20 | #include <pcmcia/cs.h> | 19 | #include <pcmcia/cs.h> |
| 21 | 20 | ||
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c index 9e2a15628de5..61746bd598b3 100644 --- a/drivers/pcmcia/i82365.c +++ b/drivers/pcmcia/i82365.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | #include <asm/io.h> | 50 | #include <asm/io.h> |
| 51 | #include <asm/system.h> | 51 | #include <asm/system.h> |
| 52 | 52 | ||
| 53 | #include <pcmcia/cs_types.h> | ||
| 54 | #include <pcmcia/ss.h> | 53 | #include <pcmcia/ss.h> |
| 55 | #include <pcmcia/cs.h> | 54 | #include <pcmcia/cs.h> |
| 56 | 55 | ||
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c index 7e16ed8eb0a4..24de49925863 100644 --- a/drivers/pcmcia/m32r_cfc.c +++ b/drivers/pcmcia/m32r_cfc.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <asm/io.h> | 26 | #include <asm/io.h> |
| 27 | #include <asm/system.h> | 27 | #include <asm/system.h> |
| 28 | 28 | ||
| 29 | #include <pcmcia/cs_types.h> | ||
| 30 | #include <pcmcia/ss.h> | 29 | #include <pcmcia/ss.h> |
| 31 | #include <pcmcia/cs.h> | 30 | #include <pcmcia/cs.h> |
| 32 | 31 | ||
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c index 6c5c3f910d71..8e4723844ad3 100644 --- a/drivers/pcmcia/m32r_pcc.c +++ b/drivers/pcmcia/m32r_pcc.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <asm/system.h> | 27 | #include <asm/system.h> |
| 28 | #include <asm/addrspace.h> | 28 | #include <asm/addrspace.h> |
| 29 | 29 | ||
| 30 | #include <pcmcia/cs_types.h> | ||
| 31 | #include <pcmcia/ss.h> | 30 | #include <pcmcia/ss.h> |
| 32 | #include <pcmcia/cs.h> | 31 | #include <pcmcia/cs.h> |
| 33 | 32 | ||
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 25e5e30a18af..f2f90a7d3e12 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
| @@ -59,7 +59,6 @@ | |||
| 59 | #include <asm/irq.h> | 59 | #include <asm/irq.h> |
| 60 | #include <asm/fs_pd.h> | 60 | #include <asm/fs_pd.h> |
| 61 | 61 | ||
| 62 | #include <pcmcia/cs_types.h> | ||
| 63 | #include <pcmcia/cs.h> | 62 | #include <pcmcia/cs.h> |
| 64 | #include <pcmcia/ss.h> | 63 | #include <pcmcia/ss.h> |
| 65 | 64 | ||
diff --git a/drivers/pcmcia/pcmcia_cis.c b/drivers/pcmcia/pcmcia_cis.c index 4a65eaf96b0a..0ac54da15885 100644 --- a/drivers/pcmcia/pcmcia_cis.c +++ b/drivers/pcmcia/pcmcia_cis.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/netdevice.h> | 20 | #include <linux/netdevice.h> |
| 21 | 21 | ||
| 22 | #include <pcmcia/cs_types.h> | ||
| 23 | #include <pcmcia/cisreg.h> | 22 | #include <pcmcia/cisreg.h> |
| 24 | #include <pcmcia/cistpl.h> | 23 | #include <pcmcia/cistpl.h> |
| 25 | #include <pcmcia/ss.h> | 24 | #include <pcmcia/ss.h> |
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index a4cd9adfcbc0..2394de468602 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | 25 | ||
| 26 | #include <asm/irq.h> | 26 | #include <asm/irq.h> |
| 27 | 27 | ||
| 28 | #include <pcmcia/cs_types.h> | ||
| 29 | #include <pcmcia/ss.h> | 28 | #include <pcmcia/ss.h> |
| 30 | #include <pcmcia/cs.h> | 29 | #include <pcmcia/cs.h> |
| 31 | #include <pcmcia/cistpl.h> | 30 | #include <pcmcia/cistpl.h> |
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index b61a13663a0a..b8a869af0f44 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/device.h> | 17 | #include <linux/device.h> |
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | 19 | ||
| 20 | #include <pcmcia/cs_types.h> | ||
| 21 | #include <pcmcia/ss.h> | 20 | #include <pcmcia/ss.h> |
| 22 | #include <pcmcia/cs.h> | 21 | #include <pcmcia/cs.h> |
| 23 | 22 | ||
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index df4532e91b1a..66c022579d9b 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <mach/pxa2xx-regs.h> | 32 | #include <mach/pxa2xx-regs.h> |
| 33 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
| 34 | 34 | ||
| 35 | #include <pcmcia/cs_types.h> | ||
| 36 | #include <pcmcia/ss.h> | 35 | #include <pcmcia/ss.h> |
| 37 | #include <pcmcia/cistpl.h> | 36 | #include <pcmcia/cistpl.h> |
| 38 | 37 | ||
diff --git a/drivers/pcmcia/rsrc_iodyn.c b/drivers/pcmcia/rsrc_iodyn.c index 6ed7bf171ca3..3b1dce2df26a 100644 --- a/drivers/pcmcia/rsrc_iodyn.c +++ b/drivers/pcmcia/rsrc_iodyn.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | 18 | ||
| 19 | #include <pcmcia/cs_types.h> | ||
| 20 | #include <pcmcia/ss.h> | 19 | #include <pcmcia/ss.h> |
| 21 | #include <pcmcia/cs.h> | 20 | #include <pcmcia/cs.h> |
| 22 | #include <pcmcia/cistpl.h> | 21 | #include <pcmcia/cistpl.h> |
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c index b12ecf7c32bf..b433a7995651 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | 18 | ||
| 19 | #include <pcmcia/cs_types.h> | ||
| 20 | #include <pcmcia/ss.h> | 19 | #include <pcmcia/ss.h> |
| 21 | #include <pcmcia/cs.h> | 20 | #include <pcmcia/cs.h> |
| 22 | #include <pcmcia/cistpl.h> | 21 | #include <pcmcia/cistpl.h> |
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index 13245a2986f3..0cca08ff65a8 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | 28 | ||
| 29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
| 30 | 30 | ||
| 31 | #include <pcmcia/cs_types.h> | ||
| 32 | #include <pcmcia/ss.h> | 31 | #include <pcmcia/ss.h> |
| 33 | #include <pcmcia/cs.h> | 32 | #include <pcmcia/cs.h> |
| 34 | #include <pcmcia/cistpl.h> | 33 | #include <pcmcia/cistpl.h> |
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c index edbd8c472628..e09851480295 100644 --- a/drivers/pcmcia/sa1100_generic.c +++ b/drivers/pcmcia/sa1100_generic.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
| 36 | #include <linux/platform_device.h> | 36 | #include <linux/platform_device.h> |
| 37 | 37 | ||
| 38 | #include <pcmcia/cs_types.h> | ||
| 39 | #include <pcmcia/cs.h> | 38 | #include <pcmcia/cs.h> |
| 40 | #include <pcmcia/ss.h> | 39 | #include <pcmcia/ss.h> |
| 41 | 40 | ||
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h index e40824ce6b0b..3fba3a679128 100644 --- a/drivers/pcmcia/soc_common.h +++ b/drivers/pcmcia/soc_common.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | /* include the world */ | 12 | /* include the world */ |
| 13 | #include <linux/cpufreq.h> | 13 | #include <linux/cpufreq.h> |
| 14 | #include <pcmcia/cs_types.h> | ||
| 15 | #include <pcmcia/cs.h> | 14 | #include <pcmcia/cs.h> |
| 16 | #include <pcmcia/ss.h> | 15 | #include <pcmcia/ss.h> |
| 17 | #include <pcmcia/cistpl.h> | 16 | #include <pcmcia/cistpl.h> |
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c index 80e36bc407da..cb0d3ace18bd 100644 --- a/drivers/pcmcia/socket_sysfs.c +++ b/drivers/pcmcia/socket_sysfs.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <asm/system.h> | 26 | #include <asm/system.h> |
| 27 | #include <asm/irq.h> | 27 | #include <asm/irq.h> |
| 28 | 28 | ||
| 29 | #include <pcmcia/cs_types.h> | ||
| 30 | #include <pcmcia/ss.h> | 29 | #include <pcmcia/ss.h> |
| 31 | #include <pcmcia/cs.h> | 30 | #include <pcmcia/cs.h> |
| 32 | #include <pcmcia/cistpl.h> | 31 | #include <pcmcia/cistpl.h> |
diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c index 56004a1b5bba..be0d841c7ebd 100644 --- a/drivers/pcmcia/tcic.c +++ b/drivers/pcmcia/tcic.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | #include <asm/io.h> | 49 | #include <asm/io.h> |
| 50 | #include <asm/system.h> | 50 | #include <asm/system.h> |
| 51 | 51 | ||
| 52 | #include <pcmcia/cs_types.h> | ||
| 53 | #include <pcmcia/cs.h> | 52 | #include <pcmcia/cs.h> |
| 54 | #include <pcmcia/ss.h> | 53 | #include <pcmcia/ss.h> |
| 55 | #include "tcic.h" | 54 | #include "tcic.h" |
diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c index 201ccfa1e97b..fa88c360c37a 100644 --- a/drivers/pcmcia/xxs1500_ss.c +++ b/drivers/pcmcia/xxs1500_ss.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
| 18 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
| 19 | 19 | ||
| 20 | #include <pcmcia/cs_types.h> | ||
| 21 | #include <pcmcia/cs.h> | 20 | #include <pcmcia/cs.h> |
| 22 | #include <pcmcia/ss.h> | 21 | #include <pcmcia/ss.h> |
| 23 | #include <pcmcia/cistpl.h> | 22 | #include <pcmcia/cistpl.h> |
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index f1d41374eea7..414d9a6f9a32 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
| 21 | 21 | ||
| 22 | #include <pcmcia/cs_types.h> | ||
| 23 | #include <pcmcia/ss.h> | 22 | #include <pcmcia/ss.h> |
| 24 | #include <pcmcia/cs.h> | 23 | #include <pcmcia/cs.h> |
| 25 | 24 | ||