diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-04-23 16:30:22 +0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-04-23 16:30:22 +0400 |
| commit | a36bf32e9e8a86f291f746b7f8292e042ee04a46 (patch) | |
| tree | c5c999baa4c214218e3adea9b336cbd9f23950ad /drivers/uwb/uwbd.c | |
| parent | bc078e4eab65f11bbaeed380593ab8151b30d703 (diff) | |
| parent | 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff) | |
| download | linux-a36bf32e9e8a86f291f746b7f8292e042ee04a46.tar.xz | |
Merge commit 'v2.6.34-rc5' into oprofile/core
Diffstat (limited to 'drivers/uwb/uwbd.c')
| -rw-r--r-- | drivers/uwb/uwbd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/uwb/uwbd.c b/drivers/uwb/uwbd.c index 5a777d8624da..001c8b4020a8 100644 --- a/drivers/uwb/uwbd.c +++ b/drivers/uwb/uwbd.c @@ -43,7 +43,7 @@ * * EVENTS * - * Events have a type, a subtype, a lenght, some other stuff and the + * Events have a type, a subtype, a length, some other stuff and the * data blob, which depends on the event. The header is 'struct * uwb_event'; for payloads, see 'struct uwbd_evt_*'. * @@ -69,6 +69,7 @@ * Handler functions are called normally uwbd_evt_handle_*(). */ #include <linux/kthread.h> +#include <linux/slab.h> #include <linux/module.h> #include <linux/freezer.h> |