diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 00:05:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 00:05:43 -0400 |
| commit | 6dbbd92522a13bcd5003829cbed30bc38a3d0362 (patch) | |
| tree | b486642d7392b81d89f159d65fd556a432e78d16 /drivers/net/ethernet/cirrus/Makefile | |
| parent | d6748066ad0e8b2514545998f8367ebb3906f299 (diff) | |
| parent | e1cfb67acd5e890bbad695000d2c997bfb7f1756 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
be2net: Add detect UE feature for Lancer
be2net: Prevent CQ full condition for Lancer
be2net: Fix disabling multicast promiscous mode
be2net: Fix endian issue in RX filter command
af_packet: de-inline some helper functions
MAINTAINERS: Add can-gw include to maintained files
net: Add back alignment for size for __alloc_skb
net: add missing bh_unlock_sock() calls
l2tp: fix race in l2tp_recv_dequeue()
ixgbevf: Update release version
ixgbe: DCB, return max for IEEE traffic classes
ixgbe: fix reading of the buffer returned by the firmware
ixgbe: Fix compiler warnings
ixgbe: fix smatch splat due to missing NULL check
ixgbe: fix disabling of Tx laser at probe
ixgbe: Fix link issues caused by a reset while interface is down
igb: Fix for I347AT4 PHY cable length unit detection
e100: make sure vlan support isn't advertised on old adapters
e1000e: demote a debugging WARN to a debug log message
net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c
...
Diffstat (limited to 'drivers/net/ethernet/cirrus/Makefile')
| -rw-r--r-- | drivers/net/ethernet/cirrus/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cirrus/Makefile b/drivers/net/ethernet/cirrus/Makefile index 14bd77e0cb5..ca245e2b5d9 100644 --- a/drivers/net/ethernet/cirrus/Makefile +++ b/drivers/net/ethernet/cirrus/Makefile | |||
| @@ -4,3 +4,4 @@ | |||
| 4 | 4 | ||
| 5 | obj-$(CONFIG_CS89x0) += cs89x0.o | 5 | obj-$(CONFIG_CS89x0) += cs89x0.o |
| 6 | obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o | 6 | obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o |
| 7 | obj-$(CONFIG_MAC89x0) += mac89x0.o | ||