diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-20 15:26:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-20 15:26:25 -0700 |
commit | f4ffaa452e71495a06376f12f772342bc57051fc (patch) | |
tree | c502a9ebd25cd4541241dd384803163703a71946 /drivers/net/wireless/bcm43xx/bcm43xx_power.h | |
parent | d3d3cf05eda861d807de539cac25bcefee0f9659 (diff) | |
parent | f18b95c3e2ab0f75b23a5aabab0bc8f99bd6bbf3 (diff) | |
download | kernel_samsung_crespo-f4ffaa452e71495a06376f12f772342bc57051fc.zip kernel_samsung_crespo-f4ffaa452e71495a06376f12f772342bc57051fc.tar.gz kernel_samsung_crespo-f4ffaa452e71495a06376f12f772342bc57051fc.tar.bz2 |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (21 commits)
[PATCH] wext: Fix RtNetlink ENCODE security permissions
[PATCH] bcm43xx: iw_priv_args names should be <16 characters
[PATCH] bcm43xx: sysfs code cleanup
[PATCH] bcm43xx: fix pctl slowclock limit calculation
[PATCH] bcm43xx: fix dyn tssi2dbm memleak
[PATCH] bcm43xx: fix config menu alignment
[PATCH] bcm43xx wireless: fix printk format warnings
[PATCH] softmac: report when scanning has finished
[PATCH] softmac: fix event sending
[PATCH] softmac: handle iw_mode properly
[PATCH] softmac: dont send out packets while scanning
[PATCH] softmac: return -EAGAIN from getscan while scanning
[PATCH] bcm43xx: set trans_start on TX to prevent bogus timeouts
[PATCH] orinoco: fix truncating commsquality RID with the latest Symbol firmware
[PATCH] softmac: fix spinlock recursion on reassoc
[PATCH] Revert NET_RADIO Kconfig title change
[PATCH] wext: Fix IWENCODEEXT security permissions
[PATCH] wireless/atmel: send WEXT scan completion events
[PATCH] wireless/airo: clean up WEXT association and scan events
[PATCH] softmac uses Wiress Ext.
...
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_power.h')
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_power.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_power.h b/drivers/net/wireless/bcm43xx/bcm43xx_power.h index 5f63640..c966ab3 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_power.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx_power.h @@ -33,6 +33,15 @@ #include <linux/types.h> +/* Clock sources */ +enum { + /* PCI clock */ + BCM43xx_PCTL_CLKSRC_PCI, + /* Crystal slow clock oscillator */ + BCM43xx_PCTL_CLKSRC_XTALOS, + /* Low power oscillator */ + BCM43xx_PCTL_CLKSRC_LOPWROS, +}; struct bcm43xx_private; |