diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-20 12:36:59 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-20 12:36:59 -0400 |
commit | c7e0c8535d73f8c5bf760926a2bd71c9840cf2ef (patch) | |
tree | 1386b9352b7b78bf1cb985463ab3aea30cb4288c /arch/arm/mach-omap2/cm44xx.h | |
parent | dfee09c8acf18e84fe197bb5d821d1e4e02d020f (diff) | |
parent | ef4669db0c9d5f06d5fd169fa461289723a93a91 (diff) |
Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0
Diffstat (limited to 'arch/arm/mach-omap2/cm44xx.h')
-rw-r--r-- | arch/arm/mach-omap2/cm44xx.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/cm44xx.h b/arch/arm/mach-omap2/cm44xx.h index 0b87ec82b41..3380beeace6 100644 --- a/arch/arm/mach-omap2/cm44xx.h +++ b/arch/arm/mach-omap2/cm44xx.h @@ -1,7 +1,7 @@ /* * OMAP4 Clock Management (CM) definitions * - * Copyright (C) 2007-2009 Texas Instruments, Inc. + * Copyright (C) 2007-2011 Texas Instruments, Inc. * Copyright (C) 2007-2009 Nokia Corporation * * Written by Paul Walmsley @@ -23,10 +23,4 @@ #define OMAP4_CM_CLKSTCTRL 0x0000 #define OMAP4_CM_STATICDEP 0x0004 -/* Function prototypes */ -# ifndef __ASSEMBLER__ - -extern int omap4_cm_wait_module_ready(void __iomem *clkctrl_reg); - -# endif #endif |