Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / ni65.c

diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index 09768524511281d06fd881f9faabdd4c4717e1bf..3edc971d0ecabfba1ecfdee18af52bc5e1204682 100644 (file)
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -183,7 +183,7 @@ static struct card {
        short addr_offset;
        unsigned char *vendor_id;
        char *cardname;
-       long config;
+       unsigned long config;
 } cards[] = {
        {
                .id0         = NI65_ID0,