mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z
This commit is contained in:
commit
ece2ccb668
375 changed files with 1008 additions and 1471 deletions
|
|
@ -32,7 +32,6 @@
|
|||
#include <linux/module.h>
|
||||
#include <linux/suspend.h>
|
||||
#include <linux/writeback.h>
|
||||
#include <linux/buffer_head.h> /* for fsync_bdev() */
|
||||
#include <linux/swap.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/vt_kern.h>
|
||||
|
|
@ -41,6 +40,7 @@
|
|||
#include <linux/oom.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/uaccess.h>
|
||||
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/irq_regs.h>
|
||||
|
|
|
|||
|
|
@ -3267,7 +3267,7 @@ void __init console_init(void)
|
|||
}
|
||||
}
|
||||
|
||||
static char *tty_devnode(struct device *dev, mode_t *mode)
|
||||
static char *tty_devnode(struct device *dev, umode_t *mode)
|
||||
{
|
||||
if (!mode)
|
||||
return NULL;
|
||||
|
|
|
|||
Loading…
Reference in a new issue