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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
cm44xx.h
diff --git
a/arch/arm/mach-omap2/cm44xx.h
b/arch/arm/mach-omap2/cm44xx.h
index
0b87ec8
..
3380bee
100644
(file)
--- a/
arch/arm/mach-omap2/cm44xx.h
+++ b/
arch/arm/mach-omap2/cm44xx.h
@@
-1,7
+1,7
@@
/*
* OMAP4 Clock Management (CM) definitions
*
/*
* OMAP4 Clock Management (CM) definitions
*
- * Copyright (C) 2007-20
09
Texas Instruments, Inc.
+ * Copyright (C) 2007-20
11
Texas Instruments, Inc.
* Copyright (C) 2007-2009 Nokia Corporation
*
* Written by Paul Walmsley
* Copyright (C) 2007-2009 Nokia Corporation
*
* Written by Paul Walmsley
@@
-23,10
+23,4
@@
#define OMAP4_CM_CLKSTCTRL 0x0000
#define OMAP4_CM_STATICDEP 0x0004
#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
#endif