diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-26 16:09:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-26 16:09:48 +1000 |
| commit | 415c157e6a97c8a7de396c55128b9dbe08e1ead3 (patch) | |
| tree | 23505fd55574e81b2f8b638327bc06e577784714 /include | |
| parent | 204da60c1c90d1cbc41289ab9e6493458011896b (diff) | |
| parent | e284f3493206d4268267db4557c7ee6f89ed2314 (diff) | |
Merge remote-tracking branch 'bcon/master'
Conflicts:
drivers/block/Kconfig
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blockconsole.h | 7 | ||||
| -rw-r--r-- | include/linux/console.h | 1 | ||||
| -rw-r--r-- | include/linux/mount.h | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/blockconsole.h b/include/linux/blockconsole.h new file mode 100644 index 000000000000..114f7c50d333 --- /dev/null +++ b/include/linux/blockconsole.h @@ -0,0 +1,7 @@ +#ifndef LINUX_BLOCKCONSOLE_H +#define LINUX_BLOCKCONSOLE_H + +int bcon_magic_present(const void *data); +void bcon_add(const char *name); + +#endif diff --git a/include/linux/console.h b/include/linux/console.h index 7571a16bd653..fdfcb703d7f5 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -115,6 +115,7 @@ static inline int con_debug_leave(void) #define CON_BOOT (8) #define CON_ANYTIME (16) /* Safe to call when cpu is offline */ #define CON_BRL (32) /* Used for a braille device */ +#define CON_ALLDATA (64) /* per-console ignore_loglevel */ struct console { char name[16]; diff --git a/include/linux/mount.h b/include/linux/mount.h index 73005f9957ea..b024d5c13c15 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -76,6 +76,6 @@ extern struct vfsmount *vfs_kern_mount(struct file_system_type *type, extern void mnt_set_expiry(struct vfsmount *mnt, struct list_head *expiry_list); extern void mark_mounts_for_expiry(struct list_head *mounts); -extern dev_t name_to_dev_t(char *name); +extern dev_t name_to_dev_t(const char *name); #endif /* _LINUX_MOUNT_H */ |