summaryrefslogtreecommitdiffstats
path: root/include/linux/usb/ulpi.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-02-02 23:10:39 +0100
committerJiri Kosina <jkosina@suse.cz>2010-02-02 23:10:39 +0100
commite1a0bdd8022317e98650e70850de73eccfcde5ad (patch)
tree462f63307118b95c8cbacee6954e4d09ee85b8d1 /include/linux/usb/ulpi.h
parent8127f4e883666c9960cfa89cffd36313748f8bab (diff)
parent1a45dcfe2525e9432cb4aba461d4994fc2befe42 (diff)
downloadkernel-crypto-e1a0bdd8022317e98650e70850de73eccfcde5ad.tar.gz
kernel-crypto-e1a0bdd8022317e98650e70850de73eccfcde5ad.tar.xz
kernel-crypto-e1a0bdd8022317e98650e70850de73eccfcde5ad.zip
Merge branch 'master' into upstream
Conflicts: drivers/hid/hid-ids.h
Diffstat (limited to 'include/linux/usb/ulpi.h')
-rw-r--r--include/linux/usb/ulpi.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/usb/ulpi.h b/include/linux/usb/ulpi.h
new file mode 100644
index 00000000000..20675c6ebc4
--- /dev/null
+++ b/include/linux/usb/ulpi.h
@@ -0,0 +1,7 @@
+#ifndef __LINUX_USB_ULPI_H
+#define __LINUX_USB_ULPI_H
+
+struct otg_transceiver *otg_ulpi_create(struct otg_io_access_ops *ops,
+ unsigned int flags);
+
+#endif /* __LINUX_USB_ULPI_H */