Automatic merge of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
This commit is contained in:
commit
d3f0fcec2d
4 changed files with 4 additions and 4 deletions
|
@ -187,7 +187,7 @@ obj-$(CONFIG_TR) += tokenring/
|
|||
obj-$(CONFIG_WAN) += wan/
|
||||
obj-$(CONFIG_ARCNET) += arcnet/
|
||||
obj-$(CONFIG_NET_PCMCIA) += pcmcia/
|
||||
obj-$(CONFIG_NET_WIRELESS) += wireless/
|
||||
obj-$(CONFIG_NET_RADIO) += wireless/
|
||||
obj-$(CONFIG_NET_TULIP) += tulip/
|
||||
obj-$(CONFIG_HAMRADIO) += hamradio/
|
||||
obj-$(CONFIG_IRDA) += irda/
|
||||
|
|
|
@ -1595,7 +1595,7 @@ static struct ethtool_ops emac_ethtool_ops = {
|
|||
static int emac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
|
||||
{
|
||||
struct ocp_enet_private *fep = dev->priv;
|
||||
uint *data = (uint *) & rq->ifr_ifru;
|
||||
uint16_t *data = (uint16_t *) & rq->ifr_ifru;
|
||||
|
||||
switch (cmd) {
|
||||
case SIOCGMIIPHY:
|
||||
|
|
|
@ -1104,7 +1104,7 @@ static void set_rx_mode(struct net_device *dev)
|
|||
if (entry != 0) {
|
||||
/* Avoid a chip errata by prefixing a dummy entry. Don't do
|
||||
this on the ULI526X as it triggers a different problem */
|
||||
if (!(tp->chip_id == ULI526X && (tp->revision = 0x40 || tp->revision == 0x50))) {
|
||||
if (!(tp->chip_id == ULI526X && (tp->revision == 0x40 || tp->revision == 0x50))) {
|
||||
tp->tx_buffers[entry].skb = NULL;
|
||||
tp->tx_buffers[entry].mapping = 0;
|
||||
tp->tx_ring[entry].length =
|
||||
|
|
|
@ -323,7 +323,7 @@ config PRISM54
|
|||
For a complete list of supported cards visit <http://prism54.org>.
|
||||
Here is the latest confirmed list of supported cards:
|
||||
|
||||
3com OfficeConnect 11g Cardbus Card aka 3CRWE154G72
|
||||
3com OfficeConnect 11g Cardbus Card aka 3CRWE154G72 (version 1)
|
||||
Allnet ALL0271 PCI Card
|
||||
Compex WL54G Cardbus Card
|
||||
Corega CG-WLCB54GT Cardbus Card
|
||||
|
|
Loading…
Reference in a new issue