3 files changed, 9 insertions, 10 deletions

diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index eb9bc365530d..c180598f1710 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -1,7 +1,7 @@
 /*
  *      Initialisation code for Cyrix/NatSemi VSA1 softaudio
  *
- *      (C) Copyright 2003 Red Hat Inc <alan@redhat.com>
+ *      (C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk>
  *
  * XpressAudio(tm) is used on the Cyrix MediaGX (now NatSemi Geode) systems.
  * The older version (VSA1) provides fairly good soundblaster emulation
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index b493660deb36..e5d423994918 100644
--- a/sound/oss/sh_dac_audio.c
+++ b/sound/oss/sh_dac_audio.c
@@ -26,7 +26,7 @@
 #include <asm/cpu/dac.h>
 #include <asm/cpu/timer.h>
 #include <asm/machvec.h>
-#include <asm/hp6xx.h>
+#include <mach/hp6xx.h>
 #include <asm/hd64461.h>
 
 #define MODNAME "sh_dac_audio"
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index 7d89c081a086..61aaedae6b7e 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -560,19 +560,18 @@ static int __init oss_init(void)
         sound_dmap_flag = (dmabuf > 0 ? 1 : 0);
 
         for (i = 0; i < ARRAY_SIZE(dev_list); i++) {
-                device_create_drvdata(sound_class, NULL,
-                                      MKDEV(SOUND_MAJOR, dev_list[i].minor),
-                                      NULL, "%s", dev_list[i].name);
+                device_create(sound_class, NULL,
+                              MKDEV(SOUND_MAJOR, dev_list[i].minor), NULL,
+                              "%s", dev_list[i].name);
 
                 if (!dev_list[i].num)
                         continue;
 
                 for (j = 1; j < *dev_list[i].num; j++)
-                        device_create_drvdata(sound_class, NULL,
-                                              MKDEV(SOUND_MAJOR,
-                                                    dev_list[i].minor + (j*0x10)),
-                                              NULL,
-                                              "%s%d", dev_list[i].name, j);
+                        device_create(sound_class, NULL,
+                                      MKDEV(SOUND_MAJOR,
+                                            dev_list[i].minor + (j*0x10)),
+                                      NULL, "%s%d", dev_list[i].name, j);
         }
 
         if (sound_nblocks >= 1024)