aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/m66592-udc.h
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@st.com>2012-07-30 17:39:43 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-30 20:25:12 -0400
commitf12a86a0987a443fb1bc2d4298e5db9c17f3e7cd (patch)
tree496e472dff68f1e46c0238f4acc563afa1c0b969 /drivers/usb/gadget/m66592-udc.h
parent6a81c26f868b2fc5f88b9f78a6f82aeab1191e61 (diff)
gadget/m66592: remove conditional compilation of clk code
With addition of dummy clk_*() calls for non CONFIG_HAVE_CLK cases in clk.h, there is no need to have clk code enclosed in #ifdef CONFIG_HAVE_CLK, #endif macros. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Mike Turquette <mturquette@linaro.org> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Cc: viresh kumar <viresh.linux@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb/gadget/m66592-udc.h')
-rw-r--r--drivers/usb/gadget/m66592-udc.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/gadget/m66592-udc.h b/drivers/usb/gadget/m66592-udc.h
index 88c85b4116a2..16c7e14678b8 100644
--- a/drivers/usb/gadget/m66592-udc.h
+++ b/drivers/usb/gadget/m66592-udc.h
@@ -13,10 +13,7 @@
13#ifndef __M66592_UDC_H__ 13#ifndef __M66592_UDC_H__
14#define __M66592_UDC_H__ 14#define __M66592_UDC_H__
15 15
16#ifdef CONFIG_HAVE_CLK
17#include <linux/clk.h> 16#include <linux/clk.h>
18#endif
19
20#include <linux/usb/m66592.h> 17#include <linux/usb/m66592.h>
21 18
22#define M66592_SYSCFG 0x00 19#define M66592_SYSCFG 0x00
@@ -468,9 +465,7 @@ struct m66592_ep {
468struct m66592 { 465struct m66592 {
469 spinlock_t lock; 466 spinlock_t lock;
470 void __iomem *reg; 467 void __iomem *reg;
471#ifdef CONFIG_HAVE_CLK
472 struct clk *clk; 468 struct clk *clk;
473#endif
474 struct m66592_platdata *pdata; 469 struct m66592_platdata *pdata;
475 unsigned long irq_trigger; 470 unsigned long irq_trigger;
476 471