diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/uwb/uwbd.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 @@ | |||
| 43 | * | 43 | * |
| 44 | * EVENTS | 44 | * EVENTS |
| 45 | * | 45 | * |
| 46 | * Events have a type, a subtype, a lenght, some other stuff and the | 46 | * Events have a type, a subtype, a length, some other stuff and the |
| 47 | * data blob, which depends on the event. The header is 'struct | 47 | * data blob, which depends on the event. The header is 'struct |
| 48 | * uwb_event'; for payloads, see 'struct uwbd_evt_*'. | 48 | * uwb_event'; for payloads, see 'struct uwbd_evt_*'. |
| 49 | * | 49 | * |
| @@ -69,6 +69,7 @@ | |||
| 69 | * Handler functions are called normally uwbd_evt_handle_*(). | 69 | * Handler functions are called normally uwbd_evt_handle_*(). |
| 70 | */ | 70 | */ |
| 71 | #include <linux/kthread.h> | 71 | #include <linux/kthread.h> |
| 72 | #include <linux/slab.h> | ||
| 72 | #include <linux/module.h> | 73 | #include <linux/module.h> |
| 73 | #include <linux/freezer.h> | 74 | #include <linux/freezer.h> |
| 74 | 75 | ||