git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-s3c24xx
/
include
/
plat
/
regs-spi.h
diff --git
a/arch/arm/plat-s3c24xx/include/plat/regs-spi.h
b/arch/arm/plat-s3c24xx/include/plat/regs-spi.h
index
2b35479
..
892e2f6
100644
(file)
--- a/
arch/arm/plat-s3c24xx/include/plat/regs-spi.h
+++ b/
arch/arm/plat-s3c24xx/include/plat/regs-spi.h
@@
-67,7
+67,6
@@
#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 */
#define S3C2410_SPPRE (0x0C)