summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-22 11:15:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-22 11:15:33 -0700
commit36c48f8cc5fc0558c1109a84b0832a26c384d8f1 (patch)
treed88904ac2960e3d7498cfeed25145834cb7a62fd /arch
parent1482338f6242dbaea46039c5f1b4604a472b364b (diff)
parent7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c (diff)
downloadop-kernel-dev-36c48f8cc5fc0558c1109a84b0832a26c384d8f1.zip
op-kernel-dev-36c48f8cc5fc0558c1109a84b0832a26c384d8f1.tar.gz
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
Diffstat (limited to 'arch')
-rw-r--r--arch/um/drivers/line.c1
-rw-r--r--arch/um/os-Linux/helper.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 64cda95..7a656bd 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -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"
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index 06d6ccf..b6b1096 100644
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -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"
OpenPOWER on IntegriCloud