Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

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

diff --git a/include/asm-arm/arch-s3c2410/spi.h b/include/asm-arm/arch-s3c2410/spi.h
index 4029a1a1ab406fcaf661f94c8243f15d0269f8c0..352d33860b6383a6584011edb5239b23b3ebcd1b 100644 (file)
--- a/include/asm-arm/arch-s3c2410/spi.h
+++ b/include/asm-arm/arch-s3c2410/spi.h
@@ -13,14 +13,9 @@
 #ifndef __ASM_ARCH_SPI_H
 #define __ASM_ARCH_SPI_H __FILE__
 
-struct s3c2410_spi_info;
-struct spi_board_info;
-
 struct s3c2410_spi_info {
        unsigned long            pin_cs;        /* simple gpio cs */
-
-       unsigned long            board_size;
-       struct spi_board_info   *board_info;
+       unsigned int             num_cs;        /* total chipselects */
 
        void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol);
 };