---

yaml --- r: 220335 b: refs/heads/master c: 199d217 h: refs/heads/master i: 220333: 75acbae 220331: 9153842 220327: 7532d88 220319: 00a53d3 v: v3
git-mirror · Oct 14, 2010 · efcc440 · efcc440
1 parent 8e60d9f
commit efcc440
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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,