diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2011-05-14 12:06:36 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-14 12:06:36 +0200 |
| commit | a18f22a968de17b29f2310cdb7ba69163e65ec15 (patch) | |
| tree | a7d56d88fad5e444d7661484109758a2f436129e /drivers/staging/ath6kl/include/a_drv_api.h | |
| parent | blackfin: convert to clocksource_register_hz (diff) | |
| parent | clocksource: convert mips to generic i8253 clocksource (diff) | |
| download | linux-dev-a18f22a968de17b29f2310cdb7ba69163e65ec15.tar.xz linux-dev-a18f22a968de17b29f2310cdb7ba69163e65ec15.zip | |
Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource
Conflicts:
arch/ia64/kernel/cyclone.c
arch/mips/kernel/i8253.c
arch/x86/kernel/i8253.c
Reason: Resolve conflicts so further cleanups do not conflict further
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/staging/ath6kl/include/a_drv_api.h')
| -rw-r--r-- | drivers/staging/ath6kl/include/a_drv_api.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/ath6kl/include/a_drv_api.h b/drivers/staging/ath6kl/include/a_drv_api.h index 7d077c62ad70..5e098cb30f56 100644 --- a/drivers/staging/ath6kl/include/a_drv_api.h +++ b/drivers/staging/ath6kl/include/a_drv_api.h @@ -188,10 +188,10 @@ extern "C" { ar6000_dbglog_event((ar), (dropped), (buffer), (length)); #define A_WMI_STREAM_TX_ACTIVE(devt,trafficClass) \ - ar6000_indicate_tx_activity((devt),(trafficClass), TRUE) + ar6000_indicate_tx_activity((devt),(trafficClass), true) #define A_WMI_STREAM_TX_INACTIVE(devt,trafficClass) \ - ar6000_indicate_tx_activity((devt),(trafficClass), FALSE) + ar6000_indicate_tx_activity((devt),(trafficClass), false) #define A_WMI_Ac2EndpointID(devht, ac)\ ar6000_ac2_endpoint_id((devht), (ac)) |