git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[safe/jmp/linux-2.6]
/
sound
/
sound_core.c
diff --git
a/sound/sound_core.c
b/sound/sound_core.c
index
bb4b88e
..
7c2d677
100644
(file)
--- a/
sound/sound_core.c
+++ b/
sound/sound_core.c
@@
-29,7
+29,7
@@
MODULE_DESCRIPTION("Core sound module");
MODULE_AUTHOR("Alan Cox");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Alan Cox");
MODULE_LICENSE("GPL");
-static char *sound_
nodename(struct device *dev
)
+static char *sound_
devnode(struct device *dev, mode_t *mode
)
{
if (MAJOR(dev->devt) == SOUND_MAJOR)
return NULL;
{
if (MAJOR(dev->devt) == SOUND_MAJOR)
return NULL;
@@
-50,7
+50,7
@@
static int __init init_soundcore(void)
return PTR_ERR(sound_class);
}
return PTR_ERR(sound_class);
}
- sound_class->
nodename = sound_nodenam
e;
+ sound_class->
devnode = sound_devnod
e;
return 0;
}
return 0;
}
@@
-61,7
+61,7
@@
static void __exit cleanup_soundcore(void)
class_destroy(sound_class);
}
class_destroy(sound_class);
}
-
module_init
(init_soundcore);
+
subsys_initcall
(init_soundcore);
module_exit(cleanup_soundcore);
module_exit(cleanup_soundcore);
@@
-353,7
+353,7
@@
static struct sound_unit *chains[SOUND_STEP];
* @dev: device pointer
*
* Allocate a special sound device by minor number from the sound
* @dev: device pointer
*
* Allocate a special sound device by minor number from the sound
- * subsystem. The allocated number is returned on succes. On failure
+ * subsystem. The allocated number is returned on succes
s
. On failure
* a negative error code is returned.
*/
* a negative error code is returned.
*/