summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-07-02 10:59:37 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-07-02 10:59:37 +0200
commitf22d4e27786c8a7f58ef7167f38c3c5dd313d290 (patch)
treea0f02af6952b17650642ceee110bc063347eea2e /include
parent6e4b15537b522fc6d393d664c12f40b4a00b5ef6 (diff)
parent1bb01712a717a2008efce4f76a3d8e43e4435eb3 (diff)
downloadbarebox-f22d4e27786c8a7f58ef7167f38c3c5dd313d290.tar.gz
barebox-f22d4e27786c8a7f58ef7167f38c3c5dd313d290.tar.xz
Merge branch 'for-next/sparse'
Diffstat (limited to 'include')
-rw-r--r--include/driver.h2
-rw-r--r--include/linux/compiler.h2
-rw-r--r--include/qsort.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/include/driver.h b/include/driver.h
index eacd8e6813..a5e3f44212 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -183,7 +183,7 @@ static inline const char *dev_name(const struct device_d *dev)
/*
* get register base 'num' for a device
*/
-void __iomem *dev_get_mem_region(struct device_d *dev, int num);
+void *dev_get_mem_region(struct device_d *dev, int num);
/*
* exlusively request register base 'num' for a device
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 5be3dab4a6..cc8c4de43e 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -4,7 +4,7 @@
#ifndef __ASSEMBLY__
#ifdef __CHECKER__
-# define __user __attribute__((noderef, address_space(1)))
+# define __user /* no user address space in barebox */
# define __kernel /* default address space */
# define __safe __attribute__((safe))
# define __force __attribute__((force))
diff --git a/include/qsort.h b/include/qsort.h
index bbb23595b2..d279dc2810 100644
--- a/include/qsort.h
+++ b/include/qsort.h
@@ -4,4 +4,6 @@
void qsort(void *base, size_t nel, size_t width,
int (*comp)(const void *, const void *));
+int strcmp_compar(const void *p1, const void *p2);
+
#endif /* __QSORT_H */