xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge upstream into 'upstream' branch of netdev-2.6.git.

Browse Source 
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
This commit is contained in:
Jeff Garzik
2005-08-24 01:03:34 -04:00
parent 8531c5ffbc 0572e3da3f
commit 75a95178da
125 changed files with 676 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/tokenring/Kconfig
View File

@@ -84,7 +84,7 @@ config 3C359
config TMS380TR
tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
depends on TR && (PCI || ISA || MCA)
depends on TR && (PCI || ISA && ISA_DMA_API || MCA)
select FW_LOADER
---help---
This driver provides generic support for token ring adapters