diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:38:36 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:38:36 -0800 |
commit | 4da5cc2cec8caec1d357053e85a7a32f243f93a1 (patch) | |
tree | 3f8b603af4af88f86be7ec1d4e3639a7fc9dd1a6 /sound/ppc/keywest.c | |
parent | 25c862cc9ea9b312c25a9f577f91b973131f1261 (diff) | |
parent | c6f43290ae687c11cdcd150d8bfeb57ec29cfa5b (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/ppc/keywest.c')
-rw-r--r-- | sound/ppc/keywest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index df073a05b5d..097fbcfc5d4 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c @@ -32,7 +32,7 @@ * we have to keep a static variable here since i2c attach_adapter * callback cannot pass a private data. */ -static pmac_keywest_t *keywest_ctx; +static struct pmac_keywest *keywest_ctx; #define I2C_DRIVERID_KEYWEST 0xFEBA @@ -106,7 +106,7 @@ static int keywest_detach_client(struct i2c_client *client) } /* exported */ -void snd_pmac_keywest_cleanup(pmac_keywest_t *i2c) +void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c) { if (keywest_ctx && keywest_ctx == i2c) { i2c_del_driver(&keywest_driver); @@ -126,7 +126,7 @@ int __init snd_pmac_tumbler_post_init(void) } /* exported */ -int __init snd_pmac_keywest_init(pmac_keywest_t *i2c) +int __init snd_pmac_keywest_init(struct pmac_keywest *i2c) { int err; |