git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
clock2xxx.h
diff --git
a/arch/arm/mach-omap2/clock2xxx.h
b/arch/arm/mach-omap2/clock2xxx.h
index
6a658b8
..
cb6df8c
100644
(file)
--- a/
arch/arm/mach-omap2/clock2xxx.h
+++ b/
arch/arm/mach-omap2/clock2xxx.h
@@
-20,16
+20,16
@@
u32 omap2xxx_get_apll_clkin(void);
u32 omap2xxx_get_sysclkdiv(void);
void omap2xxx_clk_prepare_for_reboot(void);
u32 omap2xxx_get_sysclkdiv(void);
void omap2xxx_clk_prepare_for_reboot(void);
-#ifdef CONFIG_
ARCH
_OMAP2420
+#ifdef CONFIG_
SOC
_OMAP2420
int omap2420_clk_init(void);
#else
int omap2420_clk_init(void);
#else
-#define omap2420_clk_init()
0
+#define omap2420_clk_init()
do { } while(0)
#endif
#endif
-#ifdef CONFIG_
ARCH
_OMAP2430
+#ifdef CONFIG_
SOC
_OMAP2430
int omap2430_clk_init(void);
#else
int omap2430_clk_init(void);
#else
-#define omap2430_clk_init()
0
+#define omap2430_clk_init()
do { } while(0)
#endif
extern void __iomem *prcm_clksrc_ctrl, *cm_idlest_pll;
#endif
extern void __iomem *prcm_clksrc_ctrl, *cm_idlest_pll;