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 master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
include
/
linux
/
clk.h
diff --git
a/include/linux/clk.h
b/include/linux/clk.h
index
12848f8
..
5ca8c6f
100644
(file)
--- a/
include/linux/clk.h
+++ b/
include/linux/clk.h
@@
-8,8
+8,8
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#ifndef
ASMARM_CLOC
K_H
-#define
ASMARM_CLOC
K_H
+#ifndef
__LINUX_CL
K_H
+#define
__LINUX_CL
K_H
struct device;
struct device;