[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms
[linux-2.6] / drivers / i2c /
drwxr-xr-x   ..
-rw-r--r-- 2499 Kconfig
-rw-r--r-- 205 Makefile
drwxr-xr-x - algos
drwxr-xr-x - busses
drwxr-xr-x - chips
-rw-r--r-- 31294 i2c-core.c
-rw-r--r-- 14201 i2c-dev.c