Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / drivers / net / dl2k.h

diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h
index e443065a452e690600b647250cedb2ababf1e8ab..014b77ce96df251701b5213f56af1864b6539ea4 100644 (file)
--- a/drivers/net/dl2k.h
+++ b/drivers/net/dl2k.h
@@ -633,9 +633,9 @@ struct mii_data {
 
 /* The Rx and Tx buffer descriptors. */
 struct netdev_desc {
-       u64 next_desc;
-       u64 status;
-       u64 fraginfo;
+       __le64 next_desc;
+       __le64 status;
+       __le64 fraginfo;
 };
 
 #define PRIV_ALIGN     15      /* Required alignment mask */
@@ -692,6 +692,7 @@ struct netdev_private {
 
 static const struct pci_device_id rio_pci_tbl[] = {
        {0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, },
+       {0x13f0, 0x1021, PCI_ANY_ID, PCI_ANY_ID, },
        { }
 };
 MODULE_DEVICE_TABLE (pci, rio_pci_tbl);