OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/battery-2.6
[android-x86/kernel.git]
/
drivers
/
atm
/
ambassador.h
diff --git
a/drivers/atm/ambassador.h
b/drivers/atm/ambassador.h
index
ff2a303
..
df55fa8
100644
(file)
--- a/
drivers/atm/ambassador.h
+++ b/
drivers/atm/ambassador.h
@@
-638,7
+638,7
@@
struct amb_dev {
amb_txq txq;
amb_rxq rxq[NUM_RX_POOLS];
- struct
semaphore
vcc_sf;
+ struct
mutex
vcc_sf;
amb_tx_info txer[NUM_VCS];
struct atm_vcc * rxer[NUM_VCS];
unsigned int tx_avail;