diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /include/asm-arm | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/spi.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/plat-s3c/iic.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-s3c2410/spi.h b/include/asm-arm/arch-s3c2410/spi.h index 352d33860b63..442169887d3b 100644 --- a/include/asm-arm/arch-s3c2410/spi.h +++ b/include/asm-arm/arch-s3c2410/spi.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | struct s3c2410_spi_info { | 16 | struct s3c2410_spi_info { |
| 17 | unsigned long pin_cs; /* simple gpio cs */ | 17 | unsigned long pin_cs; /* simple gpio cs */ |
| 18 | unsigned int num_cs; /* total chipselects */ | 18 | unsigned int num_cs; /* total chipselects */ |
| 19 | int bus_num; /* bus number to use. */ | ||
| 19 | 20 | ||
| 20 | void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol); | 21 | void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol); |
| 21 | }; | 22 | }; |
diff --git a/include/asm-arm/plat-s3c/iic.h b/include/asm-arm/plat-s3c/iic.h index 71211c8b5384..d08a1f2863e4 100644 --- a/include/asm-arm/plat-s3c/iic.h +++ b/include/asm-arm/plat-s3c/iic.h | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | struct s3c2410_platform_i2c { | 23 | struct s3c2410_platform_i2c { |
| 24 | int bus_num; /* bus number to use */ | ||
| 24 | unsigned int flags; | 25 | unsigned int flags; |
| 25 | unsigned int slave_addr; /* slave address for controller */ | 26 | unsigned int slave_addr; /* slave address for controller */ |
| 26 | unsigned long bus_freq; /* standard bus frequency */ | 27 | unsigned long bus_freq; /* standard bus frequency */ |