git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
sound
/
sound_core.c
diff --git
a/sound/sound_core.c
b/sound/sound_core.c
index
12522e6
..
a41f8b1
100644
(file)
--- a/
sound/sound_core.c
+++ b/
sound/sound_core.c
@@
-10,6
+10,8
@@
#include <linux/module.h>
#include <linux/device.h>
#include <linux/err.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/err.h>
+#include <linux/kdev_t.h>
+#include <linux/major.h>
#include <sound/core.h>
#ifdef CONFIG_SOUND_OSS_CORE
#include <sound/core.h>
#ifdef CONFIG_SOUND_OSS_CORE
@@
-29,6
+31,8
@@
MODULE_LICENSE("GPL");
static char *sound_nodename(struct device *dev)
{
static char *sound_nodename(struct device *dev)
{
+ if (MAJOR(dev->devt) == SOUND_MAJOR)
+ return NULL;
return kasprintf(GFP_KERNEL, "snd/%s", dev_name(dev));
}
return kasprintf(GFP_KERNEL, "snd/%s", dev_name(dev));
}
@@
-104,7
+108,6
@@
module_exit(cleanup_soundcore);
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sound.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sound.h>
-#include <linux/major.h>
#include <linux/kmod.h>
#define SOUND_STEP 16
#include <linux/kmod.h>
#define SOUND_STEP 16