i.MX6: mx6qsabrelite: Add splash screen support

[karo-tx-uboot.git] / drivers / net / dc2114x.c

diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 51e7c19e03d418d26f9e6d5c9d6d2dc106b04b00..d9fcb5a13ec705fd05735bb85e9bc28d7c454ffa 100644 (file)
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -175,7 +175,7 @@ static void  read_hw_addr(struct eth_device* dev, bd_t * bis);
 static void  send_setup_frame(struct eth_device* dev, bd_t * bis);
 
 static int   dc21x4x_init(struct eth_device* dev, bd_t* bis);
-static int   dc21x4x_send(struct eth_device* dev, volatile void *packet, int length);
+static int   dc21x4x_send(struct eth_device *dev, void *packet, int length);
 static int   dc21x4x_recv(struct eth_device* dev);
 static void  dc21x4x_halt(struct eth_device* dev);
 #ifdef CONFIG_TULIP_SELECT_MEDIA
@@ -245,15 +245,17 @@ int dc21x4x_initialize(bd_t *bis)
                pci_write_config_word(devbusfn, PCI_COMMAND, status);
 
                pci_read_config_word(devbusfn, PCI_COMMAND, &status);
+#ifdef CONFIG_TULIP_USE_IO
                if (!(status & PCI_COMMAND_IO)) {
                        printf("Error: Can not enable I/O access.\n");
                        continue;
                }
-
-               if (!(status & PCI_COMMAND_IO)) {
-                       printf("Error: Can not enable I/O access.\n");
+#else
+               if (!(status & PCI_COMMAND_MEMORY)) {
+                       printf("Error: Can not enable MEMORY access.\n");
                        continue;
                }
+#endif
 
                if (!(status & PCI_COMMAND_MASTER)) {
                        printf("Error: Can not enable Bus Mastering.\n");
@@ -388,7 +390,7 @@ static int dc21x4x_init(struct eth_device* dev, bd_t* bis)
        return 0;
 }
 
-static int dc21x4x_send(struct eth_device* dev, volatile void *packet, int length)
+static int dc21x4x_send(struct eth_device *dev, void *packet, int length)
 {
        int             status = -1;
        int             i;