diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-06 03:16:26 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-06 03:16:26 +0100 |
| commit | f6a1ad4295f9291038380178d09978caf6982dd8 (patch) | |
| tree | 7c35e8efe1812baca9c6b9674be1ee02a0495ec3 /arch/s390/mm/mmap.c | |
| parent | r8169: add byte queue limit support. (diff) | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | linux-f6a1ad4295f9291038380178d09978caf6982dd8.tar.xz linux-f6a1ad4295f9291038380178d09978caf6982dd8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/vmxnet3/vmxnet3_drv.c
Small vmxnet3 conflict with header size bug fix in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390/mm/mmap.c')
| -rw-r--r-- | arch/s390/mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c index f09c74881b7e..a0155c02e324 100644 --- a/arch/s390/mm/mmap.c +++ b/arch/s390/mm/mmap.c @@ -29,8 +29,8 @@ #include <linux/mman.h> #include <linux/module.h> #include <linux/random.h> +#include <linux/compat.h> #include <asm/pgalloc.h> -#include <asm/compat.h> static unsigned long stack_maxrandom_size(void) { |