diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 05:37:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 05:37:43 -0400 |
| commit | 04dfcfcb54b073133bcca2c8f25b55e904558931 (patch) | |
| tree | 123d13f9e242751f629924e92fcb297dc669d767 /arch/arm/mach-at91/include/mach/board.h | |
| parent | 0bd5c4f7c874cf48ff7904dcf8a59988c8fea0e8 (diff) | |
| parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/arm/mach-at91/include/mach/board.h')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/board.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h index 0b3ae21b4565..793fe7b25f36 100644 --- a/arch/arm/mach-at91/include/mach/board.h +++ b/arch/arm/mach-at91/include/mach/board.h | |||
| @@ -56,6 +56,9 @@ struct at91_cf_data { | |||
| 56 | u8 vcc_pin; /* power switching */ | 56 | u8 vcc_pin; /* power switching */ |
| 57 | u8 rst_pin; /* card reset */ | 57 | u8 rst_pin; /* card reset */ |
| 58 | u8 chipselect; /* EBI Chip Select number */ | 58 | u8 chipselect; /* EBI Chip Select number */ |
| 59 | u8 flags; | ||
| 60 | #define AT91_CF_TRUE_IDE 0x01 | ||
| 61 | #define AT91_IDE_SWAP_A0_A2 0x02 | ||
| 59 | }; | 62 | }; |
| 60 | extern void __init at91_add_device_cf(struct at91_cf_data *data); | 63 | extern void __init at91_add_device_cf(struct at91_cf_data *data); |
| 61 | 64 | ||