diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 19:35:07 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 19:35:07 +0000 |
| commit | fba670013d538719d13f103b2a5b4b06bdca202b (patch) | |
| tree | f7b97d71161a17619e0ba92ffbef5ec2e7823776 /drivers/i2c | |
| parent | [ARM] give RiscPC a NR_IRQS definition and remove default (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2 (diff) | |
| download | linux-dev-fba670013d538719d13f103b2a5b4b06bdca202b.tar.xz linux-dev-fba670013d538719d13f103b2a5b4b06bdca202b.zip | |
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.c | 4 |
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 @@ #include <asm/io.h> #include <mach/regs-gpio.h> -#include <asm/plat-s3c/regs-iic.h> -#include <asm/plat-s3c/iic.h> +#include <plat/regs-iic.h> +#include <plat/iic.h> /* i2c controller state */ |