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-s3c2410
/
mach-bast.c
diff --git
a/arch/arm/mach-s3c2410/mach-bast.c
b/arch/arm/mach-s3c2410/mach-bast.c
index
01bd767
..
4389c16
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-bast.c
+++ b/
arch/arm/mach-s3c2410/mach-bast.c
@@
-409,8
+409,7
@@
static struct platform_device bast_sio = {
static struct s3c2410_platform_i2c __initdata bast_i2c_info = {
.flags = 0,
.slave_addr = 0x10,
- .bus_freq = 100*1000,
- .max_freq = 130*1000,
+ .frequency = 100*1000,
};
/* Asix AX88796 10/100 ethernet controller */