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/nand.h | |
| parent | e0f6a4e8b17afead8add6e528936a505367c091c (diff) | |
| parent | 6777a3cf73f621892afe938983918d2aea7730b5 (diff) | |
| download | olio-uboot-2014.01-0a6deb3251a68b5be640ab1b848ca67e906b75ce.tar.xz olio-uboot-2014.01-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/nand.h')
| -rw-r--r-- | include/nand.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/nand.h b/include/nand.h index 8b3a1a77a..a48b1b8ed 100644 --- a/include/nand.h +++ b/include/nand.h @@ -37,7 +37,7 @@ extern void nand_init(void); -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> |