Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

[sfrench/cifs-2.6.git] / drivers / sbus / sbus.c

diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c
index 6349dd617f85cdd8807288597feda9d0cf736834..002643392d424accdbeb33a79f546bbe5c5d8543 100644 (file)
--- a/drivers/sbus/sbus.c
+++ b/drivers/sbus/sbus.c
@@ -6,7 +6,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/device.h>
 
 #include <asm/system.h>
@@ -35,7 +34,7 @@ struct sbus_bus *sbus_root;
 static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sdev)
 {
        unsigned long base;
-       void *pval;
+       const void *pval;
        int len, err;
 
        sdev->prom_node = dp->node;
@@ -86,7 +85,7 @@ static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sde
 
 static void __init sbus_bus_ranges_init(struct device_node *dp, struct sbus_bus *sbus)
 {
-       void *pval;
+       const void *pval;
        int len;
 
        pval = of_get_property(dp, "ranges", &len);