diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 20:15:33 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 20:15:33 +0200 |
| commit | 36c48f8cc5fc0558c1109a84b0832a26c384d8f1 (patch) | |
| tree | d88904ac2960e3d7498cfeed25145834cb7a62fd | |
| parent | scsi: fix operator precedence warning (diff) | |
| parent | uml: Fix build breakage after slab.h changes (diff) | |
| download | linux-36c48f8cc5fc0558c1109a84b0832a26c384d8f1.tar.xz linux-36c48f8cc5fc0558c1109a84b0832a26c384d8f1.zip | |
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
| -rw-r--r-- | arch/um/drivers/line.c | 1 | ||||
| -rw-r--r-- | arch/um/os-Linux/helper.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 64cda95f59ca..7a656bd8bd3c 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 06d6ccf0e444..b6b1096152aa 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" |