git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
Kconfig
diff --git
a/drivers/net/Kconfig
b/drivers/net/Kconfig
index
6c521b4
..
dd9a09c
100644
(file)
--- a/
drivers/net/Kconfig
+++ b/
drivers/net/Kconfig
@@
-1953,6
+1953,8
@@
config BCM63XX_ENET
source "drivers/net/fs_enet/Kconfig"
+source "drivers/net/octeon/Kconfig"
+
endif # NET_ETHERNET
#