---

yaml --- r: 195536 b: refs/heads/master c: e26bcf3 h: refs/heads/master v: v3
git-mirror · May 20, 2010 · 013a5bb · 013a5bb
1 parent e3e6e81
commit 013a5bb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4d80b7d5220a65cc4e26173d99d4750895f3e64
+refs/heads/master: e26bcf37234c67624f62d9fc95f922b8dbda1363
diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h
@@ -1372,18 +1372,6 @@ void *usb_alloc_coherent(struct usb_device *dev, size_t size,
 void usb_free_coherent(struct usb_device *dev, size_t size,
 	void *addr, dma_addr_t dma);
 
-/* Compatible macros while we switch over */
-static inline void *usb_buffer_alloc(struct usb_device *dev, size_t size,
-				     gfp_t mem_flags, dma_addr_t *dma)
-{
-	return usb_alloc_coherent(dev, size, mem_flags, dma);
-}
-static inline void usb_buffer_free(struct usb_device *dev, size_t size,
-				   void *addr, dma_addr_t dma)
-{
-	return usb_free_coherent(dev, size, addr, dma);
-}
-
 #if 0
 struct urb *usb_buffer_map(struct urb *urb);
 void usb_buffer_dmasync(struct urb *urb);