diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 08:45:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 08:45:42 -0800 |
| commit | d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d (patch) | |
| tree | 092bf1f6cd50db2272d12ad6991ac3465f2d19ef /include/asm-arm/arch-omap/system.h | |
| parent | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| parent | [ARM] No need to include asm/proc-fns.h into asm/system.h (diff) | |
| download | linux-dev-d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d.tar.xz linux-dev-d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-omap/system.h')
| -rw-r--r-- | include/asm-arm/arch-omap/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap/system.h b/include/asm-arm/arch-omap/system.h index b43cdd2a3874..9af415d2944a 100644 --- a/include/asm-arm/arch-omap/system.h +++ b/include/asm-arm/arch-omap/system.h @@ -7,7 +7,7 @@ #include <linux/config.h> #include <asm/mach-types.h> #include <asm/hardware/clock.h> -#include <asm/arch/hardware.h> +#include <asm/hardware.h> #include <asm/arch/prcm.h> #ifndef CONFIG_MACH_VOICEBLUE |