]> git.hungrycats.org Git - linux/commitdiff
[PCMCIA] Fix compilation of cardmgr
authorPavel Roskin <proski@org.rmk.(none)>
Wed, 23 Apr 2003 21:51:31 +0000 (22:51 +0100)
committerRussell King <rmk@flint.arm.linux.org.uk>
Wed, 23 Apr 2003 21:51:31 +0000 (22:51 +0100)
Patch from Pavel Roskin

ds.h should not be including linux/device.h when compiling userspace
code.

include/pcmcia/ds.h

index dd4700b8aea51a555d6fbe2c4534155210ab7d54..87c8e809915b60164a1d2c7eaba9850219696318 100644 (file)
@@ -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];