diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 00:32:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 00:32:01 +0200 |
| commit | f647a27417d2adc43d8c96d3d6f837422fbc076e (patch) | |
| tree | 3cac5147575ba4cbd63cb8fa226b95e7886e1d7c /drivers | |
| parent | [PATCH] fs/qnx4/*: fix sparse warnings (diff) | |
| parent | [PATCH] ARM: 2748/1: ixp2000 implementation of the iomap api (diff) | |
| download | linux-f647a27417d2adc43d8c96d3d6f837422fbc076e.tar.xz linux-f647a27417d2adc43d8c96d3d6f837422fbc076e.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-ixp2000.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c index ec943cad2314..1956af382cd8 100644 --- a/drivers/i2c/busses/i2c-ixp2000.c +++ b/drivers/i2c/busses/i2c-ixp2000.c @@ -33,7 +33,8 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> -#include <asm/hardware.h> /* Pick up IXP42000-specific bits */ +#include <asm/hardware.h> /* Pick up IXP2000-specific bits */ +#include <asm/arch/gpio.h> static inline int ixp2000_scl_pin(void *data) { |