diff --git a/[refs] b/[refs] index 94aa6c556336..e68073cc4cf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7ec94370f417fedad4db1054228ef958d48b926 +refs/heads/master: 3b7029670d39d22f288ece95254e9ba5ceddd6ba diff --git a/trunk/include/linux/usb/musb.h b/trunk/include/linux/usb/musb.h index 6f4e5014cf5e..0b72b5741645 100644 --- a/trunk/include/linux/usb/musb.h +++ b/trunk/include/linux/usb/musb.h @@ -119,7 +119,7 @@ struct musb_hdrc_platform_data { int (*set_power)(int state); /* Turn device clock on or off */ - int (*set_clock)(struct clk *clock, int is_on); + int (*set_clock)(struct clk *clock, int is_on) __deprecated; /* MUSB configuration-specific details */ struct musb_hdrc_config *config;