diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:22:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:22:22 -0700 |
commit | fd6ec5f3acfe7e94469d83374b83ff183953fa45 (patch) | |
tree | 6f7aa80a8e95c054424d9e8229da3df0dd694ecd /arch/arm/mach-at91/include/mach/board.h | |
parent | 83d5a325107cd0befa2b863e795675bc8ff881d7 (diff) | |
parent | d42ad15b759d05a87f22b484af63987eff38ea88 (diff) | |
download | kernel_samsung_smdk4412-fd6ec5f3acfe7e94469d83374b83ff183953fa45.tar.gz kernel_samsung_smdk4412-fd6ec5f3acfe7e94469d83374b83ff183953fa45.tar.bz2 kernel_samsung_smdk4412-fd6ec5f3acfe7e94469d83374b83ff183953fa45.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ata: add CFA specific identify data words
remove stale comment from <linux/hdreg.h>
AT91: initialize Compact Flash on AT91SAM9263 cpu
ide: add at91_ide driver
ide: allow to wrap interrupt handler
ide-iops: fix odd-length ATAPI PIO transfers
ide: NULL noise: drivers/ide/ide-*.c
ide: expiry() returns int, negative expiry() return values won't be noticed
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 0b3ae21b456..793fe7b25f3 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 { u8 vcc_pin; /* power switching */ u8 rst_pin; /* card reset */ u8 chipselect; /* EBI Chip Select number */ + u8 flags; +#define AT91_CF_TRUE_IDE 0x01 +#define AT91_IDE_SWAP_A0_A2 0x02 }; extern void __init at91_add_device_cf(struct at91_cf_data *data); |