From f0ff7d02d218bf855c64ca913513d2e5d94abe53 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Mon, 30 Jul 2012 14:39:32 -0700 Subject: [PATCH] --- yaml --- r: 319883 b: refs/heads/master c: 714904e1c3f48b17ceff06b827485f8b1b5d8a91 h: refs/heads/master i: 319881: 1b017398df4600f29059caa8e4f68199f9afadb0 319879: e0170cab2bf4e40d360d8e7cc45a65594a631667 v: v3 --- [refs] | 2 +- trunk/include/linux/platform_data/mv_usb.h | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 74701060eb9e..852c98127309 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd995c9d82b6eedb2e704daf44e903da0b7f6ac1 +refs/heads/master: 714904e1c3f48b17ceff06b827485f8b1b5d8a91 diff --git a/trunk/include/linux/platform_data/mv_usb.h b/trunk/include/linux/platform_data/mv_usb.h index d94804aca764..944b01dd103e 100644 --- a/trunk/include/linux/platform_data/mv_usb.h +++ b/trunk/include/linux/platform_data/mv_usb.h @@ -52,13 +52,4 @@ struct mv_usb_platform_data { int (*set_vbus)(unsigned int vbus); int (*private_init)(void __iomem *opregs, void __iomem *phyregs); }; - -#ifndef CONFIG_HAVE_CLK -/* Dummy stub for clk framework */ -#define clk_get(dev, id) NULL -#define clk_put(clock) do {} while (0) -#define clk_enable(clock) do {} while (0) -#define clk_disable(clock) do {} while (0) -#endif - #endif