Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-microblaze.git] / drivers / net / ethernet / sfc / efx.c

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 88c1eee..ad4a354 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1289,9 +1289,8 @@ static int efx_init_io(struct efx_nic *efx)
 
        pci_set_master(pci_dev);
 
-       /* Set the PCI DMA mask.  Try all possibilities from our
-        * genuine mask down to 32 bits, because some architectures
-        * (e.g. x86_64 with iommu_sac_force set) will allow 40 bit
+       /* Set the PCI DMA mask.  Try all possibilities from our genuine mask
+        * down to 32 bits, because some architectures will allow 40 bit
         * masks event though they reject 46 bit masks.
         */
        while (dma_mask > 0x7fffffffUL) {