Merge branch 'topic/section-fix' into for-linus

[linux-2.6.git] / sound / ppc / keywest.c

diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 15518e602003d9b3a0ba0f8db1197cdd6a5d866c..835fa19ed461864018fb152aa3c41eb57261cb4b 100644 (file)
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -33,10 +33,6 @@
 static struct pmac_keywest *keywest_ctx;
 
 
 static struct pmac_keywest *keywest_ctx;
 
 

-#ifndef i2c_device_name
-#define i2c_device_name(x)     ((x)->name)
-#endif
-

 static int keywest_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
 static int keywest_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {


@@ -56,7 +52,7 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter)
        if (! keywest_ctx)
                return -EINVAL;
 
        if (! keywest_ctx)
                return -EINVAL;
 

-       if (strncmp(i2c_device_name(adapter), "mac-io", 6))
+       if (strncmp(adapter->name, "mac-io", 6))

                return 0; /* ignored */
 
        memset(&info, 0, sizeof(struct i2c_board_info));
                return 0; /* ignored */
 
        memset(&info, 0, sizeof(struct i2c_board_info));