compat: move usb_{alloc,free}_coherent

usb_alloc_coherent and usb_free_coherent were introduced in kernel 2.6.34.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/include/linux/compat-2.6.34.h b/include/linux/compat-2.6.34.h
index 18ae456ce0e67c58e985a0baa99153fefc819faf..2870a3b8968b9f1afa30c6f0fa706e4b219af3ad 100644 (file)
--- a/include/linux/compat-2.6.34.h
+++ b/include/linux/compat-2.6.34.h
@@ -197,6 +197,9 @@ do {                                                        \
  */
 #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
 
+#define usb_alloc_coherent(dev, size, mem_flags, dma) usb_buffer_alloc(dev, size, mem_flags, dma)
+#define usb_free_coherent(dev, size, addr, dma) usb_buffer_free(dev, size, addr, dma)
+
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)) */
 
 #endif /* LINUX_26_34_COMPAT_H */

diff --git a/include/linux/compat-2.6.35.h b/include/linux/compat-2.6.35.h
index 278af5e329bda789cea6ad82cdd7e8d930590e64..b850f8a7ce1720f2d936eaf50fb7afec2730b9e6 100644 (file)
--- a/include/linux/compat-2.6.35.h
+++ b/include/linux/compat-2.6.35.h
@@ -20,9 +20,6 @@ static inline wait_queue_head_t *sk_sleep(struct sock *sk)
        return sk->sk_sleep;
 }
 
-#define usb_alloc_coherent(dev, size, mem_flags, dma) usb_buffer_alloc(dev, size, mem_flags, dma)
-#define usb_free_coherent(dev, size, addr, dma) usb_buffer_free(dev, size, addr, dma)
-
 #define kparam_block_sysfs_write(a)
 #define kparam_unblock_sysfs_write(a)