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 /common | |
| parent | e0f6a4e8b17afead8add6e528936a505367c091c (diff) | |
| parent | 6777a3cf73f621892afe938983918d2aea7730b5 (diff) | |
| download | u-boot-imx-0a6deb3251a68b5be640ab1b848ca67e906b75ce.zip u-boot-imx-0a6deb3251a68b5be640ab1b848ca67e906b75ce.tar.gz u-boot-imx-0a6deb3251a68b5be640ab1b848ca67e906b75ce.tar.bz2 | |
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 'common')
| -rw-r--r-- | common/cmd_onenand.c | 2 | ||||
| -rw-r--r-- | common/env_onenand.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c index 0f2e208..a0d25e5 100644 --- a/common/cmd_onenand.c +++ b/common/cmd_onenand.c @@ -13,7 +13,7 @@ #include <command.h> #include <malloc.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> diff --git a/common/env_onenand.c b/common/env_onenand.c index 652665a..7197ab6 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -33,7 +33,7 @@ #include <errno.h> #include <onenand_uboot.h> -#include <linux/mtd/compat.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> |