diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-21 06:56:52 -0800 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-21 06:56:52 -0800 |
| commit | e7e37ee9c547213d726b29c2510cbb6696050405 (patch) | |
| tree | 50c45625de666b23f209d79eb1bfae05c64feee9 /arch/arm/plat-omap/ocpi.c | |
| parent | c243f1f1f6545985afcc6adf1fc085729029c3ee (diff) | |
| parent | db93a82fa9d8b4d6e31c227922eaae829253bb88 (diff) | |
Merge ../linus/
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 2ede2ee8cae..b8614822748 100644 --- a/arch/arm/plat-omap/ocpi.c +++ b/arch/arm/plat-omap/ocpi.c @@ -34,7 +34,7 @@ #include <asm/io.h> #include <asm/hardware/clock.h> -#include <asm/arch/hardware.h> +#include <asm/hardware.h> #define OCPI_BASE 0xfffec320 #define OCPI_FAULT (OCPI_BASE + 0x00) |