Merge ../linus

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / scx200_i2c.c

diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index 8b65a5cf8251f1791f389750518529f7e0e69ec6..6cd96e43aa72a9d50ebbc8eb8a66c327bca761dc 100644 (file)
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -1,4 +1,4 @@
-/* linux/drivers/i2c/scx200_i2c.c 
+/* linux/drivers/i2c/busses/scx200_i2c.c
 
    Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
 
@@ -116,7 +116,7 @@ static int scx200_i2c_init(void)
 
 static void scx200_i2c_cleanup(void)
 {
-       i2c_bit_del_bus(&scx200_i2c_ops);
+       i2c_del_adapter(&scx200_i2c_ops);
 }
 
 module_init(scx200_i2c_init);