Merge branch 'topic/msnd' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / parisc / hppb.c

diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c
index a68b3b3761a229e0569a98d28cd29caa829aa519..13856415b4326aace5ceacec61962e94e59f0306 100644 (file)
--- a/drivers/parisc/hppb.c
+++ b/drivers/parisc/hppb.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <linux/dma-mapping.h>
 #include <linux/ioport.h>
 
 #include <asm/io.h>
@@ -28,7 +29,7 @@ struct hppb_card {
        struct hppb_card *next;
 };
 
-struct hppb_card hppb_card_head = {
+static struct hppb_card hppb_card_head = {
        .hpa = 0,
        .next = NULL,
 };
@@ -94,7 +95,7 @@ static struct parisc_driver hppb_driver = {
 };
 
 /**
- * hppb_init - HP-PB bus initalization procedure.
+ * hppb_init - HP-PB bus initialization procedure.
  *
  * Register this driver.   
  */