diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /drivers/usb/host/isp116x-hcd.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/usb/host/isp116x-hcd.c')
| -rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index a2b305477afe..92de71dc7729 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
| @@ -62,6 +62,7 @@ | |||
| 62 | #include <linux/errno.h> | 62 | #include <linux/errno.h> |
| 63 | #include <linux/init.h> | 63 | #include <linux/init.h> |
| 64 | #include <linux/list.h> | 64 | #include <linux/list.h> |
| 65 | #include <linux/slab.h> | ||
| 65 | #include <linux/usb.h> | 66 | #include <linux/usb.h> |
| 66 | #include <linux/usb/isp116x.h> | 67 | #include <linux/usb/isp116x.h> |
| 67 | #include <linux/platform_device.h> | 68 | #include <linux/platform_device.h> |