diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-02 08:29:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-02 08:31:54 +0200 |
| commit | 3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01 (patch) | |
| tree | a1a8cc85948c086aa12a1d8014151a7ca7c04ea8 /drivers/usb/musb/tusb6010.c | |
| parent | 9fc3af467d0749989518a23f7289a6f44e5cb214 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into perf/core
Conflicts:
tools/perf/Makefile
tools/perf/util/hist.c
Merge reason: Resolve the conflicts and update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/musb/tusb6010.c')
| -rw-r--r-- | drivers/usb/musb/tusb6010.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c index 05c077f8f9a..3c48e77a0aa 100644 --- a/drivers/usb/musb/tusb6010.c +++ b/drivers/usb/musb/tusb6010.c @@ -29,19 +29,6 @@ static void tusb_source_power(struct musb *musb, int is_on); #define TUSB_REV_MAJOR(reg_val) ((reg_val >> 4) & 0xf) #define TUSB_REV_MINOR(reg_val) (reg_val & 0xf) -#ifdef CONFIG_PM -/* REVISIT: These should be only needed if somebody implements off idle */ -void musb_platform_save_context(struct musb *musb, - struct musb_context_registers *musb_context) -{ -} - -void musb_platform_restore_context(struct musb *musb, - struct musb_context_registers *musb_context) -{ -} -#endif - /* * Checks the revision. We need to use the DMA register as 3.0 does not * have correct versions for TUSB_PRCM_REV or TUSB_INT_CTRL_REV. |