diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-29 11:47:03 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-29 11:47:03 +1000 |
| commit | 5ca209d244984967578d9d75a86db008ec3041c9 (patch) | |
| tree | 3b488a3c9dc591254e0d37c5ad63a2f116557510 /include | |
| parent | 59afd381ef1bcb88ecac5f9c9781e6f6cd571c4a (diff) | |
| parent | 46505c802a55189955d97195c8567ee263168747 (diff) | |
Merge remote-tracking branch 'char-misc/char-misc-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/miscdevice.h | 1 | ||||
| -rw-r--r-- | include/linux/platform_data/apds990x.h (renamed from include/linux/i2c/apds990x.h) | 0 | ||||
| -rw-r--r-- | include/linux/platform_data/bh1770glc.h (renamed from include/linux/i2c/bh1770glc.h) | 0 | ||||
| -rw-r--r-- | include/linux/sram.h | 8 |
4 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 762b5fec3383..58751eae5f77 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h @@ -54,6 +54,7 @@ #define VHOST_NET_MINOR 238 #define UHID_MINOR 239 #define USERIO_MINOR 240 +#define VHOST_VSOCK_MINOR 241 #define MISC_DYNAMIC_MINOR 255 struct device; diff --git a/include/linux/i2c/apds990x.h b/include/linux/platform_data/apds990x.h index d186fcc5d257..d186fcc5d257 100644 --- a/include/linux/i2c/apds990x.h +++ b/include/linux/platform_data/apds990x.h diff --git a/include/linux/i2c/bh1770glc.h b/include/linux/platform_data/bh1770glc.h index 8b5e2df36c72..8b5e2df36c72 100644 --- a/include/linux/i2c/bh1770glc.h +++ b/include/linux/platform_data/bh1770glc.h diff --git a/include/linux/sram.h b/include/linux/sram.h index c97dcbe8ce25..4fb405fb0480 100644 --- a/include/linux/sram.h +++ b/include/linux/sram.h @@ -16,12 +16,12 @@ struct gen_pool; #ifdef CONFIG_SRAM_EXEC -int sram_exec_copy(struct gen_pool *pool, void *dst, void *src, size_t size); +void *sram_exec_copy(struct gen_pool *pool, void *dst, void *src, size_t size); #else -static inline int sram_exec_copy(struct gen_pool *pool, void *dst, void *src, - size_t size) +static inline void *sram_exec_copy(struct gen_pool *pool, void *dst, void *src, + size_t size) { - return -ENODEV; + return NULL; } #endif /* CONFIG_SRAM_EXEC */ #endif /* __LINUX_SRAM_H__ */ |