Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bnx2x/bnx2x.h
This commit is contained in:
@ -74,7 +74,8 @@ static struct platform_device_id fec_devtype[] = {
|
||||
}, {
|
||||
.name = "imx28-fec",
|
||||
.driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_SWAP_FRAME,
|
||||
}
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
||||
static unsigned char macaddr[ETH_ALEN];
|
||||
|
Reference in New Issue
Block a user