Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[pandora-kernel.git] / drivers / parisc / hppb.c

diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c
index 9bb4db5..65eee67 100644 (file)
--- a/drivers/parisc/hppb.c
+++ b/drivers/parisc/hppb.c
@@ -16,14 +16,13 @@
 #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>
 #include <asm/hardware.h>
 #include <asm/parisc-device.h>
 
-#include <linux/pci.h>
-
 struct hppb_card {
        unsigned long hpa;
        struct resource mmio_region;
@@ -96,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.   
  */