Hi list, while trying to compile the usb-rndis driver i found out the usb_cdc header was moved from include/linux/ to include/linux/usb/ I believe the move happened with kernel release 2.6.18 but i' not sure. Anyway here is a patch which conditionally changes the include:
diff -u usb-rndis/cdc_ether.c usb-rndis.neu/cdc_ether.c --- usb-rndis/cdc_ether.c 2006-11-10 09:50:34.000000000 +0100 +++ usb-rndis.neu/cdc_ether.c 2006-11-10 09:47:56.000000000 +0100 @@ -32,7 +32,15 @@ #include <linux/workqueue.h> #include <linux/mii.h> #include <linux/usb.h> -#include <linux/usb_cdc.h> + +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) + #include <linux/usb/cdc.h> +#else + #include <linux/usb_cdc.h> +#endif + + #include "usbnet.h" diff -u usb-rndis/rndis_host.c usb-rndis.neu/rndis_host.c --- usb-rndis/rndis_host.c 2006-11-10 09:50:34.000000000 +0100 +++ usb-rndis.neu/rndis_host.c 2006-11-10 09:48:14.000000000 +0100 @@ -32,7 +32,13 @@ #include <linux/workqueue.h> #include <linux/mii.h> #include <linux/usb.h> -#include <linux/usb_cdc.h> + +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) + #include <linux/usb/cdc.h> +#else + #include <linux/usb_cdc.h> +#endif #include "ndis.h" #include "usbnet.h" Hope this helps Martin
Common subdirectories: usb-rndis/.svn and usb-rndis.neu/.svn Only in usb-rndis.neu/: Module.symvers diff -u usb-rndis/cdc_ether.c usb-rndis.neu/cdc_ether.c --- usb-rndis/cdc_ether.c 2006-11-10 09:50:34.000000000 +0100 +++ usb-rndis.neu/cdc_ether.c 2006-11-10 09:47:56.000000000 +0100 @@ -32,7 +32,15 @@ #include <linux/workqueue.h> #include <linux/mii.h> #include <linux/usb.h> -#include <linux/usb_cdc.h> + +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) + #include <linux/usb/cdc.h> +#else + #include <linux/usb_cdc.h> +#endif + + #include "usbnet.h" diff -u usb-rndis/rndis_host.c usb-rndis.neu/rndis_host.c --- usb-rndis/rndis_host.c 2006-11-10 09:50:34.000000000 +0100 +++ usb-rndis.neu/rndis_host.c 2006-11-10 09:48:14.000000000 +0100 @@ -32,7 +32,13 @@ #include <linux/workqueue.h> #include <linux/mii.h> #include <linux/usb.h> -#include <linux/usb_cdc.h> + +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) + #include <linux/usb/cdc.h> +#else + #include <linux/usb_cdc.h> +#endif #include "ndis.h" #include "usbnet.h"
pgpEfk3RNw2pL.pgp
Description: PGP signature
------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________ Synce-devel mailing list Synce-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synce-devel
