diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-03-26 22:27:45 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-26 22:27:45 +0100 |
| commit | aaa0e0812ffdf861993129f41936eb175a2eaa5f (patch) | |
| tree | 2f729e92c83925a5acb9f204e381878928c2c57f /include/asm-arm/arch-at91/hardware.h | |
| parent | 99a4ffe202d8bc1d3c4faff9b8258b686ef656ca (diff) | |
| parent | df486b1fa3f750b153eac7daa0b3bf1f594e5098 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-at91
Diffstat (limited to 'include/asm-arm/arch-at91/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-at91/hardware.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-at91/hardware.h b/include/asm-arm/arch-at91/hardware.h index b881e4e2e0..4f0e1a7e6d 100644 --- a/include/asm-arm/arch-at91/hardware.h +++ b/include/asm-arm/arch-at91/hardware.h @@ -18,7 +18,7 @@ #if defined(CONFIG_AT91RM9200) #include <asm/arch/at91rm9200.h> -#elif defined(CONFIG_AT91SAM9260) +#elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20) #include <asm/arch/at91sam9260.h> #define AT91_BASE_SPI AT91SAM9260_BASE_SPI0 #define AT91_ID_UHP AT91SAM9260_ID_UHP |