diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 18:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 18:32:01 -0400 |
| commit | f647a27417d2adc43d8c96d3d6f837422fbc076e (patch) | |
| tree | 3cac5147575ba4cbd63cb8fa226b95e7886e1d7c /drivers | |
| parent | 75043cb5b386e5a01fd03b88f647dd992de02f97 (diff) | |
| parent | 2966207c7e5945947c4db3a48aa4fa819807c5be (diff) | |
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 @@ | |||
| 33 | #include <linux/i2c.h> | 33 | #include <linux/i2c.h> |
| 34 | #include <linux/i2c-algo-bit.h> | 34 | #include <linux/i2c-algo-bit.h> |
| 35 | 35 | ||
| 36 | #include <asm/hardware.h> /* Pick up IXP42000-specific bits */ | 36 | #include <asm/hardware.h> /* Pick up IXP2000-specific bits */ |
| 37 | #include <asm/arch/gpio.h> | ||
| 37 | 38 | ||
| 38 | static inline int ixp2000_scl_pin(void *data) | 39 | static inline int ixp2000_scl_pin(void *data) |
| 39 | { | 40 | { |