diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 15:48:07 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 15:48:07 +0100 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /arch/cris/arch-v10/drivers/i2c.c | |
| parent | uwb: remove unused beacon group join/leave events (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | linux-dba0a918722ee0f0ba3442575e4448c3ab622be4.tar.xz linux-dba0a918722ee0f0ba3442575e4448c3ab622be4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/cris/arch-v10/drivers/i2c.c')
| -rw-r--r-- | arch/cris/arch-v10/drivers/i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/drivers/i2c.c b/arch/cris/arch-v10/drivers/i2c.c index 2797e67ce4f4..7f656ae0b21d 100644 --- a/arch/cris/arch-v10/drivers/i2c.c +++ b/arch/cris/arch-v10/drivers/i2c.c @@ -25,10 +25,10 @@ #include <asm/etraxi2c.h> #include <asm/system.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/io.h> #include <asm/delay.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> #include "i2c.h" |