diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 15:25:35 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 15:25:35 +0200 |
| commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
| tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /arch/alpha/boot/bootp.c | |
| parent | HID: split picolcd's operation_mode sysfs attribute (diff) | |
| parent | HID: add suspend/resume hooks for hid drivers (diff) | |
| download | linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.tar.xz linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.zip | |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'arch/alpha/boot/bootp.c')
| -rw-r--r-- | arch/alpha/boot/bootp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/boot/bootp.c b/arch/alpha/boot/bootp.c index 3c8d1b25c661..be61670d4096 100644 --- a/arch/alpha/boot/bootp.c +++ b/arch/alpha/boot/bootp.c @@ -8,6 +8,7 @@ * based significantly on the arch/alpha/boot/main.c of Linus Torvalds */ #include <linux/kernel.h> +#include <linux/slab.h> #include <linux/string.h> #include <generated/utsrelease.h> #include <linux/mm.h> |