Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Automatic merge of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
+1
-1
drivers/net/Makefile
+1
-1
drivers/net/Makefile
···
187
187
obj-$(CONFIG_WAN) += wan/
188
188
obj-$(CONFIG_ARCNET) += arcnet/
189
189
obj-$(CONFIG_NET_PCMCIA) += pcmcia/
190
-
obj-$(CONFIG_NET_WIRELESS) += wireless/
190
+
obj-$(CONFIG_NET_RADIO) += wireless/
191
191
obj-$(CONFIG_NET_TULIP) += tulip/
192
192
obj-$(CONFIG_HAMRADIO) += hamradio/
193
193
obj-$(CONFIG_IRDA) += irda/
+1
-1
drivers/net/ibm_emac/ibm_emac_core.c
+1
-1
drivers/net/ibm_emac/ibm_emac_core.c
···
1595
1595
static int emac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1596
1596
{
1597
1597
struct ocp_enet_private *fep = dev->priv;
1598
-
uint *data = (uint *) & rq->ifr_ifru;
1598
+
uint16_t *data = (uint16_t *) & rq->ifr_ifru;
1599
1599
1600
1600
switch (cmd) {
1601
1601
case SIOCGMIIPHY:
+1
-1
drivers/net/tulip/tulip_core.c
+1
-1
drivers/net/tulip/tulip_core.c
···
1104
1104
if (entry != 0) {
1105
1105
/* Avoid a chip errata by prefixing a dummy entry. Don't do
1106
1106
this on the ULI526X as it triggers a different problem */
1107
-
if (!(tp->chip_id == ULI526X && (tp->revision = 0x40 || tp->revision == 0x50))) {
1107
+
if (!(tp->chip_id == ULI526X && (tp->revision == 0x40 || tp->revision == 0x50))) {
1108
1108
tp->tx_buffers[entry].skb = NULL;
1109
1109
tp->tx_buffers[entry].mapping = 0;
1110
1110
tp->tx_ring[entry].length =
+1
-1
drivers/net/wireless/Kconfig
+1
-1
drivers/net/wireless/Kconfig
···
323
323
For a complete list of supported cards visit <http://prism54.org>.
324
324
Here is the latest confirmed list of supported cards:
325
325
326
-
3com OfficeConnect 11g Cardbus Card aka 3CRWE154G72
326
+
3com OfficeConnect 11g Cardbus Card aka 3CRWE154G72 (version 1)
327
327
Allnet ALL0271 PCI Card
328
328
Compex WL54G Cardbus Card
329
329
Corega CG-WLCB54GT Cardbus Card