diff options
Diffstat (limited to 'sound/ppc/keywest.c')
-rw-r--r-- | sound/ppc/keywest.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index a5afb2682e7f..b2e2aac22114 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c | |||
@@ -33,10 +33,6 @@ | |||
33 | static struct pmac_keywest *keywest_ctx; | 33 | static struct pmac_keywest *keywest_ctx; |
34 | 34 | ||
35 | 35 | ||
36 | #ifndef i2c_device_name | ||
37 | #define i2c_device_name(x) ((x)->name) | ||
38 | #endif | ||
39 | |||
40 | static int keywest_probe(struct i2c_client *client, | 36 | static int keywest_probe(struct i2c_client *client, |
41 | const struct i2c_device_id *id) | 37 | const struct i2c_device_id *id) |
42 | { | 38 | { |
@@ -56,7 +52,7 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter) | |||
56 | if (! keywest_ctx) | 52 | if (! keywest_ctx) |
57 | return -EINVAL; | 53 | return -EINVAL; |
58 | 54 | ||
59 | if (strncmp(i2c_device_name(adapter), "mac-io", 6)) | 55 | if (strncmp(adapter->name, "mac-io", 6)) |
60 | return 0; /* ignored */ | 56 | return 0; /* ignored */ |
61 | 57 | ||
62 | memset(&info, 0, sizeof(struct i2c_board_info)); | 58 | memset(&info, 0, sizeof(struct i2c_board_info)); |