diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-12 06:43:32 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 06:43:32 +0200 |
| commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
| tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /net/ieee80211/ieee80211_tx.c | |
| parent | powerpc: make iSeries boot again (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.xz linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.zip | |
Merge from Linus' tree
Diffstat (limited to 'net/ieee80211/ieee80211_tx.c')
| -rw-r--r-- | net/ieee80211/ieee80211_tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index c9aaff3fea1e..eed07bbbe6b6 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c @@ -207,7 +207,7 @@ void ieee80211_txb_free(struct ieee80211_txb *txb) } static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size, - int gfp_mask) + gfp_t gfp_mask) { struct ieee80211_txb *txb; int i; |