aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-29 14:35:07 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-29 14:35:07 -0500
commitfba670013d538719d13f103b2a5b4b06bdca202b (patch)
treef7b97d71161a17619e0ba92ffbef5ec2e7823776 /drivers/i2c
parent7577fdfa52438a19e7e8abedb6efc645986af2ae (diff)
parente856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff)
Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-s3c2410.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 1fac4e233133..fdebd930408e 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -40,8 +40,8 @@
40#include <asm/io.h> 40#include <asm/io.h>
41 41
42#include <mach/regs-gpio.h> 42#include <mach/regs-gpio.h>
43#include <asm/plat-s3c/regs-iic.h> 43#include <plat/regs-iic.h>
44#include <asm/plat-s3c/iic.h> 44#include <plat/iic.h>
45 45
46/* i2c controller state */ 46/* i2c controller state */
47 47