aboutsummaryrefslogtreecommitdiffstats
path: root/arch/avr32
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-20 11:35:57 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-20 11:35:57 +0100
commit64b36ca7f408e0bd45487c8c28f168f11f3b6dcd (patch)
tree0b8ed22d46d775f04d441e8c480c12ec297a005b /arch/avr32
parenttracing/function-graph-tracer: fix merge (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-dev-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.xz
linux-dev-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.zip
Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/core
Diffstat (limited to 'arch/avr32')
-rw-r--r--arch/avr32/mach-at32ap/include/mach/board.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index aafaf7a78886..cff8e84f78f2 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -116,6 +116,7 @@ struct atmel_nand_data {
int enable_pin; /* chip enable */
int det_pin; /* card detect */
int rdy_pin; /* ready/busy */
+ u8 rdy_pin_active_low; /* rdy_pin value is inverted */
u8 ale; /* address line number connected to ALE */
u8 cle; /* address line number connected to CLE */
u8 bus_width_16; /* buswidth is 16 bit */