diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
| commit | 772320e84588dcbe1600ffb83e5f328f2209ac2a (patch) | |
| tree | a7de21b79340aeaa17c58126f6b801b82c77b53a /drivers/misc/ibmasm/module.c | |
| parent | 1ce53adf13a54375d2a5c7cdbe341b2558389615 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
Diffstat (limited to 'drivers/misc/ibmasm/module.c')
| -rw-r--r-- | drivers/misc/ibmasm/module.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c index dc14b0b9cbfa..a234d965243b 100644 --- a/drivers/misc/ibmasm/module.c +++ b/drivers/misc/ibmasm/module.c | |||
| @@ -52,6 +52,7 @@ | |||
| 52 | 52 | ||
| 53 | #include <linux/pci.h> | 53 | #include <linux/pci.h> |
| 54 | #include <linux/init.h> | 54 | #include <linux/init.h> |
| 55 | #include <linux/slab.h> | ||
| 55 | #include "ibmasm.h" | 56 | #include "ibmasm.h" |
| 56 | #include "lowlevel.h" | 57 | #include "lowlevel.h" |
| 57 | #include "remote.h" | 58 | #include "remote.h" |