pcmcia-3.2.8 and linux-2.6.13-rc1?

[Dominik Brodowski]

Hi,

On Tue, Jul 05, 2005 at 03:48:42PM +0200, Steven Scholz wrote:
> Hi there,
> 
> pcmcia-cs-3.2.8 (or at least its cardmgr) won't compile with 
> linux-2.6.13-rc1.

Thanks for the analysis. Hopefully this patch fixes it (it does for 
me), if it does, I'll push it upstream ASAP.


Fix pcnet-cs compilation with recent pcmcia kernel changes.

Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>

Index: 2.6.12-git10/include/pcmcia/ds.h
===================================================================
--- 2.6.12-git10.orig/include/pcmcia/ds.h
+++ 2.6.12-git10/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;