projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[libata] Bump versions
[powerpc.git]
/
sound
/
oss
/
nm256_audio.c
diff --git
a/sound/oss/nm256_audio.c
b/sound/oss/nm256_audio.c
index
42d8f05
..
6e662ac
100644
(file)
--- a/
sound/oss/nm256_audio.c
+++ b/
sound/oss/nm256_audio.c
@@
-960,7
+960,7
@@
static struct ac97_mixer_value_list mixer_defaults[] = {
/* Installs the AC97 mixer into CARD. */
/* Installs the AC97 mixer into CARD. */
-static int __init
+static int __
dev
init
nm256_install_mixer (struct nm256_info *card)
{
int mixer;
nm256_install_mixer (struct nm256_info *card)
{
int mixer;
@@
-995,7
+995,7
@@
nm256_install_mixer (struct nm256_info *card)
* RAM.
*/
* RAM.
*/
-static void __init
+static void __
dev
init
nm256_peek_for_sig (struct nm256_info *card)
{
u32 port1offset
nm256_peek_for_sig (struct nm256_info *card)
{
u32 port1offset
@@
-1056,7
+1056,7
@@
nm256_install(struct pci_dev *pcidev, enum nm256rev rev, char *verstr)
card->playing = 0;
card->recording = 0;
card->rev = rev;
card->playing = 0;
card->recording = 0;
card->rev = rev;
-
spin_lock_init(&card->lock);
+ spin_lock_init(&card->lock);
/* Init the memory port info. */
for (x = 0; x < 2; x++) {
/* Init the memory port info. */
for (x = 0; x < 2; x++) {
@@
-1644,7
+1644,7
@@
module_param(force_load, bool, 0);
static int __init do_init_nm256(void)
{
printk (KERN_INFO "NeoMagic 256AV/256ZX audio driver, version 1.1p\n");
static int __init do_init_nm256(void)
{
printk (KERN_INFO "NeoMagic 256AV/256ZX audio driver, version 1.1p\n");
- return pci_
module_init
(&nm256_pci_driver);
+ return pci_
register_driver
(&nm256_pci_driver);
}
static void __exit cleanup_nm256 (void)
}
static void __exit cleanup_nm256 (void)