diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 18:24:00 +0100 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 18:24:00 +0100 |
commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /include/asm-arm/arch-at91rm9200/at91_rstc.h | |
parent | [SCSI] qla2xxx: Remove unnecessary spinlock primitive - mbx_reg_lock. (diff) | |
parent | Linux 2.6.20-rc7 (diff) | |
download | linux-30716e07ef511ec7525c07eb1e8060ba8943c2a2.tar.xz linux-30716e07ef511ec7525c07eb1e8060ba8943c2a2.zip |
Merge branch 'linus'
Diffstat (limited to 'include/asm-arm/arch-at91rm9200/at91_rstc.h')
-rw-r--r-- | include/asm-arm/arch-at91rm9200/at91_rstc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-at91rm9200/at91_rstc.h b/include/asm-arm/arch-at91rm9200/at91_rstc.h index ccdc52da973d..237d3c40b318 100644 --- a/include/asm-arm/arch-at91rm9200/at91_rstc.h +++ b/include/asm-arm/arch-at91rm9200/at91_rstc.h @@ -17,7 +17,7 @@ #define AT91_RSTC_PROCRST (1 << 0) /* Processor Reset */ #define AT91_RSTC_PERRST (1 << 2) /* Peripheral Reset */ #define AT91_RSTC_EXTRST (1 << 3) /* External Reset */ -#define AT01_RSTC_KEY (0xff << 24) /* KEY Password */ +#define AT91_RSTC_KEY (0xff << 24) /* KEY Password */ #define AT91_RSTC_SR (AT91_RSTC + 0x04) /* Reset Controller Status Register */ #define AT91_RSTC_URSTS (1 << 0) /* User Reset Status */ |