diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /include/asm-arm/arch-at91rm9200/uncompress.h | |
| parent | [AGPGART] Make AGP depend on PCI (diff) | |
| parent | [PATCH] KConfig: Spellchecking 'similarity' and 'independent' (diff) | |
| download | linux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz linux-55b4d6a52195a8f277ffddf755ddaff359878f41.zip | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'include/asm-arm/arch-at91rm9200/uncompress.h')
| -rw-r--r-- | include/asm-arm/arch-at91rm9200/uncompress.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-at91rm9200/uncompress.h b/include/asm-arm/arch-at91rm9200/uncompress.h index 7b38497c24b5..ec7811ab0a52 100644 --- a/include/asm-arm/arch-at91rm9200/uncompress.h +++ b/include/asm-arm/arch-at91rm9200/uncompress.h @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_UNCOMPRESS_H #define __ASM_ARCH_UNCOMPRESS_H -#include <asm/arch/hardware.h> +#include <asm/hardware.h> /* * The following code assumes the serial port has already been |