diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /drivers/sound/ics2101.c | |
parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) |
Merge with 2.4.0-test7.
Diffstat (limited to 'drivers/sound/ics2101.c')
-rw-r--r-- | drivers/sound/ics2101.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/sound/ics2101.c b/drivers/sound/ics2101.c index 3b97a157b..84ca968df 100644 --- a/drivers/sound/ics2101.c +++ b/drivers/sound/ics2101.c @@ -206,9 +206,10 @@ static int ics2101_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg) static struct mixer_operations ics2101_mixer_operations = { - "ICS2101", - "ICS2101 Multimedia Mixer", - ics2101_mixer_ioctl + owner: THIS_MODULE, + id: "ICS2101", + name: "ICS2101 Multimedia Mixer", + ioctl: ics2101_mixer_ioctl }; int |