diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-29 14:28:08 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-29 14:28:08 -0400 |
| commit | b4093d6235b7e4249616651ee328600ced48a18a (patch) | |
| tree | 9f5b8e466e2d26fbe13ee7934f9e939a09815bd5 /drivers/net/arm/Makefile | |
| parent | d9ab77161d811ffb0bccf396f7155cc905c1b9e1 (diff) | |
| parent | 7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/arm/Makefile')
| -rw-r--r-- | drivers/net/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile index 811a3ccd14c1..303171f589e6 100644 --- a/drivers/net/arm/Makefile +++ b/drivers/net/arm/Makefile | |||
| @@ -11,3 +11,4 @@ obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o | |||
| 11 | obj-$(CONFIG_ARM_KS8695_ETHER) += ks8695net.o | 11 | obj-$(CONFIG_ARM_KS8695_ETHER) += ks8695net.o |
| 12 | obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o | 12 | obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o |
| 13 | obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o | 13 | obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o |
| 14 | obj-$(CONFIG_W90P910_ETH) += w90p910_ether.o | ||