projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
[linux-2.6-block.git]
/
drivers
/
net
/
dsa
/
Makefile
diff --git
a/drivers/net/dsa/Makefile
b/drivers/net/dsa/Makefile
index 8346e4f9737af50cfacae7e2639649d2255796cf..a3c94163221723c610791bd0e0a98df05c7dc221 100644
(file)
--- a/
drivers/net/dsa/Makefile
+++ b/
drivers/net/dsa/Makefile
@@
-1,5
+1,6
@@
obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm_sf2.o
+obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm-sf2.o
+bcm-sf2-objs := bcm_sf2.o bcm_sf2_cfp.o
obj-$(CONFIG_NET_DSA_QCA8K) += qca8k.o
obj-y += b53/