[SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index fa484d4f241e57d6eed4fa8407327efad4ca2b99..99daeee4209d610891ad17c52bd182e431ad9955 100644 (file)
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -1032,7 +1032,9 @@ static void sun4v_vdev_irq_trans_init(struct device_node *dp)
 static void irq_trans_init(struct device_node *dp)
 {
        const char *model;
+#ifdef CONFIG_PCI
        int i;
+#endif
 
        model = of_get_property(dp, "model", NULL);
        if (!model)

diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 8dcbfbffacc9a181321609656098e7435f7165b8..b43de647ba73187dee153f261f9cd7b136728c80 100644 (file)
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -788,12 +788,15 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id
        if (!regs)
                return -ENOMEM;
 
+#ifdef CONFIG_PCI
        if (!strcmp(model, "ds1287") ||
            !strcmp(model, "m5819") ||
            !strcmp(model, "m5819p") ||
            !strcmp(model, "m5823")) {
                ds1287_regs = (unsigned long) regs;
-       } else if (model[5] == '0' && model[6] == '2') {
+       } else
+#endif
+       if (model[5] == '0' && model[6] == '2') {
                mstk48t02_regs = regs;
        } else if(model[5] == '0' && model[6] == '8') {
                mstk48t08_regs = regs;

diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h
index 0f5b89c9323bfb936ac27380594c1bc4ab7f740f..27c46fbeebd6cd5c8ec59491d14114ac686a23b3 100644 (file)
--- a/include/asm-sparc64/dma-mapping.h
+++ b/include/asm-sparc64/dma-mapping.h
@@ -160,6 +160,20 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
        BUG();
 }
 
+static inline void
+dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
+                       enum dma_data_direction direction)
+{
+       BUG();
+}
+
+static inline void
+dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
+                          enum dma_data_direction direction)
+{
+       BUG();
+}
+
 #endif /* PCI */