projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into next
[linux-2.6]
/
drivers
/
net
/
arm
/
Makefile
diff --git
a/drivers/net/arm/Makefile
b/drivers/net/arm/Makefile
index
bc263ed
..
7c812ac
100644
(file)
--- a/
drivers/net/arm/Makefile
+++ b/
drivers/net/arm/Makefile
@@
-7,3
+7,6
@@
obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o
obj-$(CONFIG_ARM_ETHERH) += etherh.o
obj-$(CONFIG_ARM_ETHER3) += ether3.o
obj-$(CONFIG_ARM_ETHER1) += ether1.o
+obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
+obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
+obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o