diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 09:08:27 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 09:08:27 +0200 |
| commit | e19553427c2e8fdb04fdd98e407164bb59a840ba (patch) | |
| tree | 5332234b2dad07c03c27e4608afb16f297f41e61 /drivers/pcmcia/sa11xx_base.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming... (diff) | |
| parent | SH: fix error paths in DMA driver (diff) | |
| download | linux-e19553427c2e8fdb04fdd98e407164bb59a840ba.tar.xz linux-e19553427c2e8fdb04fdd98e407164bb59a840ba.zip | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/kernel/dwarf.c
drivers/dma/shdma.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/pcmcia/sa11xx_base.c')
| -rw-r--r-- | drivers/pcmcia/sa11xx_base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c index fc9a6527019b..fa28d8911b00 100644 --- a/drivers/pcmcia/sa11xx_base.c +++ b/drivers/pcmcia/sa11xx_base.c @@ -37,6 +37,7 @@ #include <linux/kernel.h> #include <linux/spinlock.h> #include <linux/io.h> +#include <linux/slab.h> #include <mach/hardware.h> #include <asm/irq.h> |