[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms
[linux-2.6] / drivers / i2c / busses / scx200_i2c.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2