Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36c48f8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc 

* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
  uml: Fix build breakage after slab.h changes
parents 1482338f 7f3c1fa4

arch/um/drivers/line.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "linux/irqreturn.h"

#include "linux/kd.h"

#include "linux/sched.h"

#include "linux/slab.h"

#include "chan_kern.h"

#include "irq_kern.h"

#include "irq_user.h"

arch/um/os-Linux/helper.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <errno.h>

#include <sched.h>

#include <linux/limits.h>

#include <linux/slab.h>

#include <sys/socket.h>

#include <sys/wait.h>

#include "kern_constants.h"