diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-13 12:15:43 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 12:15:43 -0700 |
commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /include/pcmcia/ds.h | |
parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
download | linux-3.10-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.gz linux-3.10-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.bz2 linux-3.10-99ad25a313bda566a346b46a6015afa65bc0a02b.zip |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/pcmcia/ds.h')
-rw-r--r-- | include/pcmcia/ds.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index 0190e766e1a..b707a603351 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h @@ -16,10 +16,13 @@ #ifndef _LINUX_DS_H #define _LINUX_DS_H +#ifdef __KERNEL__ +#include <linux/mod_devicetable.h> +#endif + #include <pcmcia/bulkmem.h> #include <pcmcia/cs_types.h> #include <pcmcia/device_id.h> -#include <linux/mod_devicetable.h> typedef struct tuple_parse_t { tuple_t tuple; |