From 189ca6756b8f556e1b1e7ca77851efcd00c5ef26 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 2 Dec 2010 10:55:29 +0200 Subject: [PATCH] --- yaml --- r: 227004 b: refs/heads/master c: fa56df915d101770a495569473b4c13b1904087b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/musb_core.h | 2 -- trunk/include/linux/usb/musb.h | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c675cd000850..688021cf7986 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0349176120aa3024e96ae4fd7dc0e0181dc55f52 +refs/heads/master: fa56df915d101770a495569473b4c13b1904087b diff --git a/trunk/drivers/usb/musb/musb_core.h b/trunk/drivers/usb/musb/musb_core.h index 6c8e9630fb19..1e538675ab86 100644 --- a/trunk/drivers/usb/musb/musb_core.h +++ b/trunk/drivers/usb/musb/musb_core.h @@ -455,8 +455,6 @@ struct musb { u8 board_mode; /* enum musb_mode */ int (*board_set_power)(int state); - int (*set_clock)(struct clk *clk, int is_active); - u8 min_power; /* vbus for periph, in mA/2 */ bool is_host; diff --git a/trunk/include/linux/usb/musb.h b/trunk/include/linux/usb/musb.h index 0b72b5741645..0b0e383035e5 100644 --- a/trunk/include/linux/usb/musb.h +++ b/trunk/include/linux/usb/musb.h @@ -118,9 +118,6 @@ struct musb_hdrc_platform_data { /* Power the device on or off */ int (*set_power)(int state); - /* Turn device clock on or off */ - int (*set_clock)(struct clk *clock, int is_on) __deprecated; - /* MUSB configuration-specific details */ struct musb_hdrc_config *config;