summaryrefslogtreecommitdiffstats
path: root/include/usb
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-04-26 02:34:44 +0000
committerAnatolij Gustschin <agust@denx.de>2012-04-30 16:54:51 +0200
commit6777a3cf73f621892afe938983918d2aea7730b5 (patch)
tree7c14bec563272f70afe3cdca3d589bfe9a6a553d /include/usb
parent7b15e2bb9b1026925f0f98243cd6cf80bd3fb47d (diff)
downloadu-boot-6777a3cf73f621892afe938983918d2aea7730b5.tar.gz
u-boot-6777a3cf73f621892afe938983918d2aea7730b5.tar.xz
u-boot-6777a3cf73f621892afe938983918d2aea7730b5.zip
lin_gadget: use common linux/compat.h
Merge our duplicate definitions with the common header. Also fix drivers/usb/gadget/s3c_udc_otg_xfer_dma.c to use min() instead of min_t() since we remove the latter from compat.h. Additionally use memalign() directly as the lin_gadget specific kmalloc() macro is removed from lin_gadget_compat.h by this patch. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Anatolij Gustschin <agust@denx.de> Cc: Lukasz Majewski <l.majewski@samsung.com>
Diffstat (limited to 'include/usb')
-rw-r--r--include/usb/lin_gadget_compat.h15
1 files changed, 2 insertions, 13 deletions
diff --git a/include/usb/lin_gadget_compat.h b/include/usb/lin_gadget_compat.h
index 1b937e43a2..8287b9de9f 100644
--- a/include/usb/lin_gadget_compat.h
+++ b/include/usb/lin_gadget_compat.h
@@ -23,6 +23,8 @@
#ifndef __LIN_COMPAT_H__
#define __LIN_COMPAT_H__
+#include <linux/compat.h>
+
/* common */
#define spin_lock_init(...)
#define spin_lock(...)
@@ -36,25 +38,12 @@
#define mutex_lock(...)
#define mutex_unlock(...)
-#define WARN_ON(x) if (x) {printf("WARNING in %s line %d\n" \
- , __FILE__, __LINE__); }
-
-#define KERN_WARNING
-#define KERN_ERR
-#define KERN_NOTICE
-#define KERN_DEBUG
-
#define GFP_KERNEL 0
#define IRQ_HANDLED 1
#define ENOTSUPP 524 /* Operation is not supported */
-#define kmalloc(size, type) memalign(CONFIG_SYS_CACHELINE_SIZE, size)
-#define kfree(addr) free(addr)
-
-#define __iomem
-#define min_t min
#define dma_cache_maint(addr, size, mode) cache_flush()
void cache_flush(void);