Merge branch 'musb-v2.6.37-rc2' of git://gitorious.org/usb/usb into work-linus

This commit is contained in:
Greg Kroah-Hartman 2010-11-09 09:28:51 -08:00
commit 5c4dd2242a
7 changed files with 114 additions and 69 deletions

View file

@ -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
};