Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / sound / pci / hda / hda_hwdep.c

diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index 64be7b533488e86fbdb530df0be9d0b283899cf0..6e18a422d993efcf68a2bf4be92d534f96f30d25 100644 (file)
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -18,7 +18,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
@@ -83,13 +82,13 @@ static int hda_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
 static int hda_hwdep_ioctl_compat(struct snd_hwdep *hw, struct file *file,
                                  unsigned int cmd, unsigned long arg)
 {
-       return hda_hwdep_ioctl(hw, file, cmd, compat_ptr(arg));
+       return hda_hwdep_ioctl(hw, file, cmd, (unsigned long)compat_ptr(arg));
 }
 #endif
 
 static int hda_hwdep_open(struct snd_hwdep *hw, struct file *file)
 {
-#ifndef CONFIG_SND_DEBUG_DETECT
+#ifndef CONFIG_SND_DEBUG_VERBOSE
        if (!capable(CAP_SYS_RAWIO))
                return -EACCES;
 #endif