Merge branch 'omap2-upstream' into devel

This commit is contained in:
Russell King
2008-04-19 17:17:29 +01:00
committed by Russell King
737 changed files with 24644 additions and 14697 deletions
+1 -1
View File
@@ -2635,7 +2635,7 @@ config NIU
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
depends on PPC64 && PCI
depends on PPC_PASEMI && PCI
select PHYLIB
select INET_LRO
help