From 9fc43ef5dc218a82b0690198c01fd2084abc5a60 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 10 May 2010 23:22:49 +0200 Subject: [PATCH] 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 --- include/linux/compat-2.6.34.h | 3 +++ include/linux/compat-2.6.35.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/compat-2.6.34.h b/include/linux/compat-2.6.34.h index 18ae456ce0e6..2870a3b8968b 100644 --- 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 278af5e329bd..b850f8a7ce17 100644 --- 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) -- 2.30.2