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 'for-2.6.30' into for-2.6.31
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2412
/
mach-jive.c
diff --git
a/arch/arm/mach-s3c2412/mach-jive.c
b/arch/arm/mach-s3c2412/mach-jive.c
index
72c266a
..
332bd32
100644
(file)
--- a/
arch/arm/mach-s3c2412/mach-jive.c
+++ b/
arch/arm/mach-s3c2412/mach-jive.c
@@
-453,8
+453,7
@@
static struct spi_board_info __initdata jive_spi_devs[] = {
/* I2C bus and device configuration. */
static struct s3c2410_platform_i2c jive_i2c_cfg __initdata = {
- .max_freq = 80 * 1000,
- .bus_freq = 50 * 1000,
+ .frequency = 80 * 1000,
.flags = S3C_IICFLG_FILTER,
.sda_delay = 2,
};