diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 10:45:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 10:45:22 -0800 |
| commit | 8995b161eb142b843094dd614b80e4cce1d66352 (patch) | |
| tree | ffd9988879441d5ec45ab96b2e06f4fcb1210158 /arch/arm/plat-omap/ocpi.c | |
| parent | cc918c7ab7da017bfaf9661420bb5c462e057cfb (diff) | |
| parent | fe5dd7c73d328b255286b6b65ca19dd34447f709 (diff) | |
| download | blackbird-op-linux-8995b161eb142b843094dd614b80e4cce1d66352.tar.gz blackbird-op-linux-8995b161eb142b843094dd614b80e4cce1d66352.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/plat-omap/ocpi.c')
| -rw-r--r-- | arch/arm/plat-omap/ocpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c index b86148227480..e40fcc8b43d4 100644 --- a/arch/arm/plat-omap/ocpi.c +++ b/arch/arm/plat-omap/ocpi.c @@ -31,9 +31,9 @@ #include <linux/init.h> #include <linux/spinlock.h> #include <linux/err.h> +#include <linux/clk.h> #include <asm/io.h> -#include <asm/hardware/clock.h> #include <asm/hardware.h> #define OCPI_BASE 0xfffec320 |
