diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 20:42:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 20:42:41 -0500 |
| commit | 61edab8d144ae7b4d7206b91adec947579a73c0a (patch) | |
| tree | 61a38f0e119405eb3978bb30df78ff25ab690809 /drivers/net/sunhme.c | |
| parent | 2655e2cee2d77459fcb7e10228259e4ee0328697 (diff) | |
| parent | f2511f13daaf00fdd206bee7b108f75923a613c6 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
phylib: Silence driver registration
phylib: Add ID for Marvell 88E1240
82596: free nonexistent resource fix
SUNHME: Fix missing NETIF_F_VLAN_CHALLENGED on PCI happy meals
Diffstat (limited to 'drivers/net/sunhme.c')
| -rw-r--r-- | drivers/net/sunhme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 120c8affe83d..c20a3bd21bb2 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
| @@ -3143,8 +3143,8 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, | |||
| 3143 | dev->irq = pdev->irq; | 3143 | dev->irq = pdev->irq; |
| 3144 | dev->dma = 0; | 3144 | dev->dma = 0; |
| 3145 | 3145 | ||
| 3146 | /* Happy Meal can do it all... */ | 3146 | /* Happy Meal can do it all... except VLAN. */ |
| 3147 | dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM; | 3147 | dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_VLAN_CHALLENGED; |
| 3148 | 3148 | ||
| 3149 | #if defined(CONFIG_SBUS) && defined(CONFIG_PCI) | 3149 | #if defined(CONFIG_SBUS) && defined(CONFIG_PCI) |
| 3150 | /* Hook up PCI register/dma accessors. */ | 3150 | /* Hook up PCI register/dma accessors. */ |