diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 17:22:22 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 17:26:41 +1100 |
| commit | ef9ea503472da2992fcde8954ec3445d450d2781 (patch) | |
| tree | d2ed39ac34f23090ae7cd8819bfc82d238d62d17 /arch/alpha/kernel/process.c | |
| parent | fb260b23c0a9225c93e8892280c6d73797a3cecc (diff) | |
| parent | 8b2fe80f5a68b2ebcb0d83f09b94e0890fd8e0b5 (diff) | |
Merge remote branch 'slabh/slabh'
Conflicts:
drivers/char/sysrq.c
drivers/gpu/drm/radeon/r300.c
drivers/hid/hid-wacom.c
drivers/media/video/soc_camera.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
drivers/pcmcia/pcmcia_resource.c
drivers/s390/char/vmcp.c
drivers/staging/cx25821/cx25821-audio-upstream.c
fs/9p/vfs_super.c
include/linux/percpu.h
kernel/audit_watch.c
net/mac80211/scan.c
sound/soc/codecs/ad1938.c
Diffstat (limited to 'arch/alpha/kernel/process.c')
| -rw-r--r-- | arch/alpha/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c index 289039bb6bb2..395a464353b8 100644 --- a/arch/alpha/kernel/process.c +++ b/arch/alpha/kernel/process.c @@ -17,7 +17,6 @@ #include <linux/stddef.h> #include <linux/unistd.h> #include <linux/ptrace.h> -#include <linux/slab.h> #include <linux/user.h> #include <linux/time.h> #include <linux/major.h> @@ -28,6 +27,7 @@ #include <linux/reboot.h> #include <linux/tty.h> #include <linux/console.h> +#include <linux/slab.h> #include <asm/reg.h> #include <asm/uaccess.h> |