diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:44:02 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:44:02 -0500 |
| commit | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (patch) | |
| tree | 41758e4da78f94a20813554ef9f5ed9b323a4f8c /drivers/base/platform.c | |
| parent | cd8200e6d4f9f05e6ea48f7c000be890337396ac (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
| download | op-kernel-dev-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.zip op-kernel-dev-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'drivers/base/platform.c')
| -rw-r--r-- | drivers/base/platform.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 75ce871..d597c92 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -10,12 +10,13 @@ * information. */ -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/module.h> #include <linux/init.h> #include <linux/dma-mapping.h> #include <linux/bootmem.h> #include <linux/err.h> +#include <linux/slab.h> #include "base.h" |
