aboutsummaryrefslogtreecommitdiff
path: root/include/linux/usb/gadgetfs.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-25 16:40:10 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-25 16:40:10 +0100
commit2e31add2a7e2a15d07f592c21ba35870fa9a1d1f (patch)
tree814e2c70fb5528f108114c0da6e5a1e219e6a0e1 /include/linux/usb/gadgetfs.h
parentd639bab8da86d330493487e8c0fea8ca31f53427 (diff)
parent17581ad812a9abb0182260374ef2e52d4a808a64 (diff)
Merge branch 'x86/urgent' into x86/pat
Diffstat (limited to 'include/linux/usb/gadgetfs.h')
-rw-r--r--include/linux/usb/gadgetfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/gadgetfs.h b/include/linux/usb/gadgetfs.h
index ea45f265ec0..612102e4d75 100644
--- a/include/linux/usb/gadgetfs.h
+++ b/include/linux/usb/gadgetfs.h
@@ -18,7 +18,7 @@
#ifndef __LINUX_USB_GADGETFS_H
#define __LINUX_USB_GADGETFS_H
-#include <asm/types.h>
+#include <linux/types.h>
#include <asm/ioctl.h>
#include <linux/usb/ch9.h>