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 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
clkdev_omap.h
diff --git
a/arch/arm/plat-omap/include/plat/clkdev_omap.h
b/arch/arm/plat-omap/include/plat/clkdev_omap.h
index
b19774c
..
256ab3f
100644
(file)
--- a/
arch/arm/plat-omap/include/plat/clkdev_omap.h
+++ b/
arch/arm/plat-omap/include/plat/clkdev_omap.h
@@
-8,7
+8,7
@@
#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_PLAT_CLKDEV_OMAP_H
#define __ARCH_ARM_PLAT_OMAP_INCLUDE_PLAT_CLKDEV_OMAP_H
-#include <
asm
/clkdev.h>
+#include <
linux
/clkdev.h>
struct omap_clk {
u16 cpu;