diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-09 18:28:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-09 18:28:51 +0100 |
| commit | 5c4dd2242a1b95a6c7596a0a82c495f6d3593e2d (patch) | |
| tree | 0fe5e7fa7bcc6213df560f77b9b297c01a8f4344 /include | |
| parent | USB: the development of the usb tree is now in git (diff) | |
| parent | usb: musb: fail unaligned DMA transfers on v1.8 and above (diff) | |
| download | linux-5c4dd2242a1b95a6c7596a0a82c495f6d3593e2d.tar.xz linux-5c4dd2242a1b95a6c7596a0a82c495f6d3593e2d.zip | |
Merge branch 'musb-v2.6.37-rc2' of git://gitorious.org/usb/usb into work-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/musb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h index ee2dd1d506ed..2387f9fc8138 100644 --- a/include/linux/usb/musb.h +++ b/include/linux/usb/musb.h @@ -89,6 +89,8 @@ struct musb_hdrc_config { /* A GPIO controlling VRSEL in Blackfin */ unsigned int gpio_vrsel; unsigned int gpio_vrsel_active; + /* musb CLKIN in Blackfin in MHZ */ + unsigned char clkin; #endif }; |