A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Browse source 
Conflicts:
	net/mac80211/debugfs_sta.c
	net/mac80211/sta_info.h
This commit is contained in:
John W. Linville 2012-02-15 16:24:37 -05:00
commit ca994a36f5
2634 changed files with 108988 additions and 45234 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/ssb/driver_pcicore.c
View file

@ -75,7 +75,7 @@ static u32 get_cfgspace_addr(struct ssb_pcicore *pc,
u32 tmp;
/* We do only have one cardbus device behind the bridge. */
if (pc->cardbusmode && (dev >= 1))
if (pc->cardbusmode && (dev > 1))
goto out;
if (bus == 0) {