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 'linux-next' of git://git.infradead.org/ubifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-s3c24xx
/
setup-i2c.c
diff --git
a/arch/arm/plat-s3c24xx/setup-i2c.c
b/arch/arm/plat-s3c24xx/setup-i2c.c
index
d62b7e7
..
71a6acc
100644
(file)
--- a/
arch/arm/plat-s3c24xx/setup-i2c.c
+++ b/
arch/arm/plat-s3c24xx/setup-i2c.c
@@
-11,6
+11,7
@@
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
+#include <linux/gpio.h>
struct platform_device;
struct platform_device;
@@
-20,6
+21,6
@@
struct platform_device;
void s3c_i2c0_cfg_gpio(struct platform_device *dev)
{
void s3c_i2c0_cfg_gpio(struct platform_device *dev)
{
- s3c2410_gpio_cfgpin(S3C2410_GPE
15
, S3C2410_GPE15_IICSDA);
- s3c2410_gpio_cfgpin(S3C2410_GPE
14
, S3C2410_GPE14_IICSCL);
+ s3c2410_gpio_cfgpin(S3C2410_GPE
(15)
, S3C2410_GPE15_IICSDA);
+ s3c2410_gpio_cfgpin(S3C2410_GPE
(14)
, S3C2410_GPE14_IICSCL);
}
}