diff options
| author | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
|---|---|---|
| committer | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
| commit | ab26a6a563a0acb589af87a8e063c0e171d75665 (patch) | |
| tree | 71a432bde5d016e928ab3ad7860fca01312ec787 /tools/ioemu/usb-linux.c | |
| parent | d3be8a6ca1aa9312cc01e780a2fea56ab8ec12b4 (diff) | |
| parent | 1c804664cf63f0c2e80d0420e52d5f82c3956685 (diff) | |
| download | xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.gz xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.bz2 xen-ab26a6a563a0acb589af87a8e063c0e171d75665.zip | |
Merge with xen-unstable.hg.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Diffstat (limited to 'tools/ioemu/usb-linux.c')
| -rw-r--r-- | tools/ioemu/usb-linux.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/ioemu/usb-linux.c b/tools/ioemu/usb-linux.c index 0a13753d48..ef60179704 100644 --- a/tools/ioemu/usb-linux.c +++ b/tools/ioemu/usb-linux.c @@ -26,7 +26,9 @@ #if defined(__linux__) #include <dirent.h> #include <sys/ioctl.h> -#include <linux/compiler.h> +/* Some versions of usbdevice_fs.h need __user to be defined for them. */ +/* This may (harmlessly) conflict with a definition in linux/compiler.h. */ +#define __user #include <linux/usbdevice_fs.h> #include <linux/version.h> |