Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / net / ethernet / smsc / smc911x.c

diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c
index 3f57110..a733868 100644 (file)
--- a/drivers/net/ethernet/smsc/smc911x.c
+++ b/drivers/net/ethernet/smsc/smc911x.c
@@ -1791,9 +1791,11 @@ static int smc911x_probe(struct net_device *dev)
        unsigned int val, chip_id, revision;
        const char *version_string;
        unsigned long irq_flags;
+#ifdef SMC_USE_DMA
        struct dma_slave_config config;
        dma_cap_mask_t mask;
        struct pxad_param param;
+#endif
 
        DBG(SMC_DEBUG_FUNC, dev, "--> %s\n", __func__);