summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@conectiva.com.br>2002-11-20 19:18:58 -0200
committerArnaldo Carvalho de Melo <acme@conectiva.com.br>2002-11-20 19:18:58 -0200
commit3d4275173d5d7cc6406a3dd43ba2fef4c256a34e (patch)
tree9d1aa0e9ee6ef8ed648707f7b8f94dfdafb561b4
parent2ea2d9ad7f8b2b6359670e01e9384f58f5c85b67 (diff)
sound: fix up header cleanups: add include <linux/interrupt.h>
also fix a bug in hammerfall driver, removing __exit from a function that is called from a non __exit function.
-rw-r--r--sound/isa/ad1816a/ad1816a_lib.c6
-rw-r--r--sound/pci/rme9652/hammerfall_mem.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index f39c11de5890..6e3edc724889 100644
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -19,15 +19,17 @@
*/
#include <sound/driver.h>
-#include <asm/io.h>
-#include <asm/dma.h>
#include <linux/delay.h>
#include <linux/init.h>
+#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/ioport.h>
#include <sound/core.h>
#include <sound/ad1816a.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+
MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
MODULE_DESCRIPTION("lowlevel code for Analog Devices AD1816A chip");
MODULE_LICENSE("GPL");
diff --git a/sound/pci/rme9652/hammerfall_mem.c b/sound/pci/rme9652/hammerfall_mem.c
index 2705ca915220..0e44ba440acf 100644
--- a/sound/pci/rme9652/hammerfall_mem.c
+++ b/sound/pci/rme9652/hammerfall_mem.c
@@ -178,7 +178,7 @@ void snd_hammerfall_free_buffer (struct pci_dev *pcidev, void *addr)
printk ("Hammerfall memory allocator: unknown buffer address or PCI device ID");
}
-static void __exit hammerfall_free_buffers (void)
+static void hammerfall_free_buffers (void)
{
int i;