From efcc4406efc4b04d902565ba20c22f7d0f101773 Mon Sep 17 00:00:00 2001 From: "mike.rapoport@gmail.com" Date: Wed, 13 Oct 2010 00:09:11 +0200 Subject: [PATCH] --- yaml --- r: 220335 b: refs/heads/master c: 199d217c52dcc961dfd5928e5cbc32cc8a9140d9 h: refs/heads/master i: 220333: 75acbae037a59d2c2a2563283667bc66ddc7c1ee 220331: 9153842eb63d8165d866fa9239d34bc66edf9d78 220327: 7532d880be0d388752cff7f5ca9a8eb0272c2609 220319: 00a53d37c820df582158c8a2297303f4fe2d2716 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/include/linux_osl.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2e2593d5c458..a41a4153f97a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fcc1fcb2ec18094b3a8022b1974c0b2e9f5f73c +refs/heads/master: 199d217c52dcc961dfd5928e5cbc32cc8a9140d9 diff --git a/trunk/drivers/staging/brcm80211/include/linux_osl.h b/trunk/drivers/staging/brcm80211/include/linux_osl.h index f5f91e06ec3e..9bca3b761ab7 100644 --- a/trunk/drivers/staging/brcm80211/include/linux_osl.h +++ b/trunk/drivers/staging/brcm80211/include/linux_osl.h @@ -97,9 +97,6 @@ typedef struct { #define MFREE(osh, addr, size) osl_mfree((osh), (addr), (size)) extern void osl_mfree(osl_t *osh, void *addr, uint size); -#define NATIVE_MALLOC(osh, size) kmalloc(size, GFP_ATOMIC) -#define NATIVE_MFREE(osh, addr, size) kfree(addr) - #define DMA_CONSISTENT_ALIGN osl_dma_consistent_align() extern uint osl_dma_consistent_align(void); extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, u16 align,