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

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

Browse Source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/rt2x00/rt2800pci.c
This commit is contained in:
David S. Miller
2010-02-25 23:26:21 -08:00
parent 0448873480 4a6967b88a
commit 19bc291c99
104 changed files with 3108 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wireless/rt2x00/rt61pci.h
View File

@@ -27,6 +27,13 @@
#ifndef RT61PCI_H
#define RT61PCI_H
/*
* RT chip PCI IDs.
*/
#define RT2561s_PCI_ID 0x0301
#define RT2561_PCI_ID 0x0302
#define RT2661_PCI_ID 0x0401
/*
* RF chip defines.
*/
@@ -225,6 +232,8 @@ struct hw_pairwise_ta_entry {
* MAC_CSR0: ASIC revision number.
*/
#define MAC_CSR0 0x3000
#define MAC_CSR0_REVISION FIELD32(0x0000000f)
#define MAC_CSR0_CHIPSET FIELD32(0x000ffff0)
/*
* MAC_CSR1: System control register.