Automatic merge of /spare/repo/netdev-2.6 branch smc91x

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-s3c2410 / regs-spi.h

diff --git a/include/asm-arm/arch-s3c2410/regs-spi.h b/include/asm-arm/arch-s3c2410/regs-spi.h
index cb502a88158b2ad4a892c641aac5657ee25cc309..338217858c730a55b4f5edf4f8214ede33a25639 100644 (file)
--- a/include/asm-arm/arch-s3c2410/regs-spi.h
+++ b/include/asm-arm/arch-s3c2410/regs-spi.h
@@ -12,6 +12,7 @@
  *    20-04-2004     KF      Created file
  *    04-10-2004     BJD     Removed VA address (no longer mapped)
  *                          tidied file for submission
+ *    03-04-2005     LCVR    Added S3C2400_SPPIN_nCS definition
  */
 
 #ifndef __ASM_ARCH_REGS_SPI_H
@@ -46,6 +47,7 @@
 
 #define S3C2410_SPPIN_ENMUL      (1<<2)        /* Multi Master Error detect */
 #define S3C2410_SPPIN_RESERVED   (1<<1)
+#define S3C2400_SPPIN_nCS        (1<<1)        /* SPI Card Select */
 #define S3C2410_SPPIN_KEEP       (1<<0)        /* Master Out keep */