Merge branch 'master'

4 files changed, 25 insertions, 19 deletions

diff --git a/sound/oss/au1000.c b/sound/oss/au1000.c
index 2c2ae2ee01ac..c407de86cbb6 100644
--- a/sound/oss/au1000.c
+++ b/sound/oss/au1000.c
@@ -563,7 +563,7 @@ static void start_adc(struct au1000_state *s)
 #define DMABUF_DEFAULTORDER (17-PAGE_SHIFT)
 #define DMABUF_MINORDER 1
 
-extern inline void dealloc_dmabuf(struct au1000_state *s, struct dmabuf *db)
+static inline void dealloc_dmabuf(struct au1000_state *s, struct dmabuf *db)
 {
         struct page    *page, *pend;
 
@@ -667,14 +667,14 @@ static int prog_dmabuf(struct au1000_state *s, struct dmabuf *db)
         return 0;
 }
 
-extern inline int prog_dmabuf_adc(struct au1000_state *s)
+static inline int prog_dmabuf_adc(struct au1000_state *s)
 {
         stop_adc(s);
         return prog_dmabuf(s, &s->dma_adc);
 
 }
 
-extern inline int prog_dmabuf_dac(struct au1000_state *s)
+static inline int prog_dmabuf_dac(struct au1000_state *s)
 {
         stop_dac(s);
         return prog_dmabuf(s, &s->dma_dac);
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index b2bf8bac842d..cebd881b91ae 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -2805,16 +2805,7 @@ __init setup_beep(void)
         return 0 ;
 }
 
-static struct input_dev awacs_beep_dev = {
-        .evbit          = { BIT(EV_SND) },
-        .sndbit         = { BIT(SND_BELL) | BIT(SND_TONE) },
-        .event          = awacs_beep_event,
-        .name           = "dmasound beeper",
-        .phys           = "macio/input0", /* what the heck is this?? */
-        .id             = {
-                .bustype        = BUS_HOST,
-        },
-};
+static struct input_dev *awacs_beep_dev;
 
 int __init dmasound_awacs_init(void)
 {
@@ -2907,6 +2898,22 @@ printk("dmasound_pmac: couldn't find a Codec we can handle\n");
                 return -ENODEV;
         }
 
+        awacs_beep_dev = input_allocate_device();
+        if (!awacs_beep_dev) {
+                release_OF_resource(io, 0);
+                release_OF_resource(io, 1);
+                release_OF_resource(io, 2);
+                printk(KERN_ERR "dmasound: can't allocate input device !\n");
+                return -ENOMEM;
+        }
+
+        awacs_beep_dev->name = "dmasound beeper";
+        awacs_beep_dev->phys = "macio/input0";
+        awacs_beep_dev->id.bustype = BUS_HOST;
+        awacs_beep_dev->event = awacs_beep_event;
+        awacs_beep_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
+        awacs_beep_dev->evbit[0] = BIT(EV_SND);
+
         /* all OF versions I've seen use this value */
         if (i2s_node)
                 i2s = ioremap(io->addrs[0].address, 0x1000);
@@ -3140,14 +3147,14 @@ printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev);
          * XXX: we should handle errors here, but that would mean
          * rewriting the whole init code.  later..
          */
-        input_register_device(&awacs_beep_dev);
+        input_register_device(awacs_beep_dev);
 
         return dmasound_init();
 }
 
 static void __exit dmasound_awacs_cleanup(void)
 {
-        input_unregister_device(&awacs_beep_dev);
+        input_unregister_device(awacs_beep_dev);
 
         switch (awacs_revision) {
                 case AWACS_TUMBLER:
diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
index 0481e5e54ddf..9ac4bf7e1e89 100644
--- a/sound/oss/nec_vrc5477.c
+++ b/sound/oss/nec_vrc5477.c
@@ -435,7 +435,7 @@ static int ac97_codec_not_present(struct ac97_codec *codec)
 
 /* --------------------------------------------------------------------- */
 
-extern inline void
+static inline void
 stop_dac(struct vrc5477_ac97_state *s)
 {
         struct dmabuf* db = &s->dma_dac;
@@ -553,7 +553,7 @@ static void start_dac(struct vrc5477_ac97_state *s)
         spin_unlock_irqrestore(&s->lock, flags);
 }       
 
-extern inline void stop_adc(struct vrc5477_ac97_state *s)
+static inline void stop_adc(struct vrc5477_ac97_state *s)
 {
         struct dmabuf* db = &s->dma_adc;
         unsigned long flags;
@@ -652,7 +652,7 @@ static void start_adc(struct vrc5477_ac97_state *s)
 #define DMABUF_DEFAULTORDER (16-PAGE_SHIFT)
 #define DMABUF_MINORDER 1
 
-extern inline void dealloc_dmabuf(struct vrc5477_ac97_state *s,
+static inline void dealloc_dmabuf(struct vrc5477_ac97_state *s,
                                   struct dmabuf *db)
 {
         if (db->lbuf) {
diff --git a/sound/oss/sequencer_syms.c b/sound/oss/sequencer_syms.c
index 45edfd767e4e..5d008798c310 100644
--- a/sound/oss/sequencer_syms.c
+++ b/sound/oss/sequencer_syms.c
@@ -19,7 +19,6 @@ EXPORT_SYMBOL(sequencer_timer);
 EXPORT_SYMBOL(sound_timer_init);
 EXPORT_SYMBOL(sound_timer_interrupt);
 EXPORT_SYMBOL(sound_timer_syncinterval);
-EXPORT_SYMBOL(reprogram_timer);
 
 /* Tuning */