---

yaml --- r: 319883 b: refs/heads/master c: 714904e h: refs/heads/master i: 319881: 1b01739 319879: e0170ca v: v3
git-mirror · Jul 31, 2012 · f0ff7d0 · f0ff7d0
1 parent 5d67860
commit f0ff7d0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git 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
@@ -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