diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
| commit | e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa (patch) | |
| tree | 075fbf70c17a50190c3fb290eb6b362177f0d1e5 /include | |
| parent | 18aa86831ed72380b7c2edba3c27bbf7a999da76 (diff) | |
| parent | 1e7f2bd25c28b36c7c40ed4797b2a21cc4e1502e (diff) | |
| download | barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.gz barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
scripts/Makefile
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/mtd.h | 1 | ||||
| -rw-r--r-- | include/mci.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index 00f1642cd5..293f5041af 100644 --- a/include/common.h +++ b/include/common.h @@ -115,6 +115,8 @@ long simple_strtol(const char *cp,char **endp,unsigned int base); /* lib_generic/crc32.c */ uint32_t crc32(uint32_t, const void*, unsigned int); uint32_t crc32_no_comp(uint32_t, const void*, unsigned int); +int file_crc(char *filename, ulong start, ulong size, ulong *crc, + ulong *total); /* common/console.c */ int ctrlc (void); diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 1735b49874..402e4978b1 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -12,6 +12,7 @@ #ifndef DOXYGEN_SHOULD_SKIP_THIS #include <driver.h> +#include <errno.h> #include <linux/types.h> #include <linux/list.h> #include <linux/mtd/mtd-abi.h> diff --git a/include/mci.h b/include/mci.h index 07ac2731f7..0f10e8aea9 100644 --- a/include/mci.h +++ b/include/mci.h @@ -286,7 +286,7 @@ struct mci; struct mci_host { struct device_d *hw_dev; /**< the host MCI hardware device */ struct mci *mci; - char *devname; /**< the devicename for the card, defaults to disk%d */ + const char *devname; /**< the devicename for the card, defaults to disk%d */ unsigned voltages; unsigned host_caps; /**< Host's interface capabilities, refer MMC_VDD_* */ unsigned f_min; /**< host interface lower limit */ |