diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-15 13:46:29 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-15 13:46:29 +0200 |
commit | b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40 (patch) | |
tree | 53ccb1c2c14751fe69cf93102e76e97021f6df07 /arch/arm/mach-iop33x/include/mach/iq80332.h | |
parent | 4f962d4d65923d7b722192e729840cfb79af0a5a (diff) | |
parent | 278429cff8809958d25415ba0ed32b59866ab1a8 (diff) | |
download | talos-op-linux-b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40.tar.gz talos-op-linux-b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40.zip |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
Diffstat (limited to 'arch/arm/mach-iop33x/include/mach/iq80332.h')
-rw-r--r-- | arch/arm/mach-iop33x/include/mach/iq80332.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-iop33x/include/mach/iq80332.h b/arch/arm/mach-iop33x/include/mach/iq80332.h new file mode 100644 index 000000000000..8325d71f2ed5 --- /dev/null +++ b/arch/arm/mach-iop33x/include/mach/iq80332.h @@ -0,0 +1,16 @@ +/* + * arch/arm/mach-iop33x/include/mach/iq80332.h + * + * Intel IQ80332 evaluation board registers + */ + +#ifndef __IQ80332_H +#define __IQ80332_H + +#define IQ80332_7SEG_1 0xce840000 /* 7-Segment MSB */ +#define IQ80332_7SEG_0 0xce850000 /* 7-Segment LSB (WO) */ +#define IQ80332_ROTARY_SW 0xce8d0000 /* Rotary Switch */ +#define IQ80332_BATT_STAT 0xce8f0000 /* Battery Status */ + + +#endif |