Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / regulator / dummy.h

diff --git a/drivers/regulator/dummy.h b/drivers/regulator/dummy.h
index 3921c0e24249226fc356679fb7128c86712b1665..97a11b7e8882e1b514f803bf98d42512eb2a452a 100644 (file)
--- a/drivers/regulator/dummy.h
+++ b/drivers/regulator/dummy.h
@@ -22,10 +22,6 @@ struct regulator_dev;
 
 extern struct regulator_dev *dummy_regulator_rdev;
 
-#ifdef CONFIG_REGULATOR_DUMMY
 void __init regulator_dummy_init(void);
-#else
-static inline void regulator_dummy_init(void) { }
-#endif
 
 #endif