diff options
author | Wolfgang Denk <wd@denx.de> | 2012-04-30 18:19:28 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2012-04-30 18:19:28 +0200 |
commit | 0a6deb3251a68b5be640ab1b848ca67e906b75ce (patch) | |
tree | 8bf3b48fdf66cad167186110fb6ab4f79a335a57 /include/usb/lin_gadget_compat.h | |
parent | e0f6a4e8b17afead8add6e528936a505367c091c (diff) | |
parent | 6777a3cf73f621892afe938983918d2aea7730b5 (diff) | |
download | blackbird-obmc-uboot-0a6deb3251a68b5be640ab1b848ca67e906b75ce.tar.gz blackbird-obmc-uboot-0a6deb3251a68b5be640ab1b848ca67e906b75ce.zip |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
lin_gadget: use common linux/compat.h
linux/compat.h: rename from linux/mtd/compat.h
lin_gadget: use common mdelay
gunzip: rename z{alloc, free} to gz{alloc, free}
fs/fat: align disk buffers on cache line to enable DMA and cache
part_dos: align disk buffers on cache line to enable DMA and cache
Diffstat (limited to 'include/usb/lin_gadget_compat.h')
-rw-r--r-- | include/usb/lin_gadget_compat.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/usb/lin_gadget_compat.h b/include/usb/lin_gadget_compat.h index fce3be7e80..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,26 +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 mdelay(n) ({unsigned long msec = (n); while (msec--) udelay(1000); }) - -#define __iomem -#define min_t min #define dma_cache_maint(addr, size, mode) cache_flush() void cache_flush(void); |