diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-23 01:35:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-23 01:35:33 -0700 |
| commit | 83e410b82c80a9248904850b5af96e166b76d03b (patch) | |
| tree | 14d5d20d12b671b5d540b0f2ffdf762d9229fa73 /include | |
| parent | 70ced8bfb70ae687cd39c3ffc047cd345c4bb00f (diff) | |
| parent | 41c5d53309617c99774d735a22560a581a8eff8e (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/pcmcia/bus_ops.h | 2 | ||||
| -rw-r--r-- | include/pcmcia/driver_ops.h | 2 | ||||
| -rw-r--r-- | include/pcmcia/ds.h | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/include/pcmcia/bus_ops.h b/include/pcmcia/bus_ops.h index eb094dd03fca..e69de29bb2d1 100644 --- a/include/pcmcia/bus_ops.h +++ b/include/pcmcia/bus_ops.h @@ -1,2 +0,0 @@ -/* now empty */ -#warning please remove the reference to this file diff --git a/include/pcmcia/driver_ops.h b/include/pcmcia/driver_ops.h index eb094dd03fca..e69de29bb2d1 100644 --- a/include/pcmcia/driver_ops.h +++ b/include/pcmcia/driver_ops.h @@ -1,2 +0,0 @@ -/* now empty */ -#warning please remove the reference to this file diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index dd4700b8aea5..87c8e809915b 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h @@ -31,7 +31,6 @@ #define _LINUX_DS_H #include <pcmcia/bulkmem.h> -#include <linux/device.h> #include <pcmcia/cs_types.h> typedef struct tuple_parse_t { @@ -107,6 +106,7 @@ typedef union ds_ioctl_arg_t { #define DS_BIND_MTD _IOWR('d', 64, mtd_info_t) #ifdef __KERNEL__ +#include <linux/device.h> typedef struct dev_node_t { char dev_name[DEV_NAME_LEN]; |