git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[safe/jmp/linux-2.6]
/
drivers
/
uio
/
uio_pdrv.c
diff --git
a/drivers/uio/uio_pdrv.c
b/drivers/uio/uio_pdrv.c
index
0b4ef39
..
7d3e469
100644
(file)
--- a/
drivers/uio/uio_pdrv.c
+++ b/
drivers/uio/uio_pdrv.c
@@
-11,8
+11,9
@@
#include <linux/platform_device.h>
#include <linux/uio_driver.h>
#include <linux/stringify.h>
+#include <linux/slab.h>
-#define DRIVER_NAME "uio"
+#define DRIVER_NAME "uio
_pdrv
"
struct uio_platdata {
struct uio_info *uioinfo;