projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
sound
/
pci
/
fm801.c
diff --git
a/sound/pci/fm801.c
b/sound/pci/fm801.c
index
6dc578b
..
9939109
100644
(file)
--- a/
sound/pci/fm801.c
+++ b/
sound/pci/fm801.c
@@
-1,6
+1,6
@@
/*
* The driver for the ForteMedia FM801 based soundcards
/*
* The driver for the ForteMedia FM801 based soundcards
- * Copyright (c) by Jaroslav Kysela <perex@
suse
.cz>
+ * Copyright (c) by Jaroslav Kysela <perex@
perex
.cz>
*
* Support FM only card by Andy Shevchenko <andy@smile.org.ua>
*
*
* Support FM only card by Andy Shevchenko <andy@smile.org.ua>
*
@@
-42,7
+42,7
@@
#define TEA575X_RADIO 1
#endif
#define TEA575X_RADIO 1
#endif
-MODULE_AUTHOR("Jaroslav Kysela <perex@
suse
.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@
perex
.cz>");
MODULE_DESCRIPTION("ForteMedia FM801");
MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{ForteMedia,FM801},"
MODULE_DESCRIPTION("ForteMedia FM801");
MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{ForteMedia,FM801},"
@@
-1369,7
+1369,6
@@
static int __devinit snd_fm801_create(struct snd_card *card,
struct fm801 ** rchip)
{
struct fm801 *chip;
struct fm801 ** rchip)
{
struct fm801 *chip;
- unsigned char rev;
int err;
static struct snd_device_ops ops = {
.dev_free = snd_fm801_dev_free,
int err;
static struct snd_device_ops ops = {
.dev_free = snd_fm801_dev_free,
@@
-1405,8
+1404,7
@@
static int __devinit snd_fm801_create(struct snd_card *card,
pci_set_master(pci);
}
pci_set_master(pci);
}
- pci_read_config_byte(pci, PCI_REVISION_ID, &rev);
- if (rev >= 0xb1) /* FM801-AU */
+ if (pci->revision >= 0xb1) /* FM801-AU */
chip->multichannel = 1;
snd_fm801_chip_init(chip, 0);
chip->multichannel = 1;
snd_fm801_chip_init(chip, 0);