diff options
| author | David Woodhouse | 2010-05-10 15:32:46 +0200 |
|---|---|---|
| committer | David Woodhouse | 2010-05-10 15:32:46 +0200 |
| commit | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 (patch) | |
| tree | 4f449d929b5df9e126e839f388ff0fd2b52028a0 /drivers/mtd/maps/bfin-async-flash.c | |
| parent | mtd: mpc5121_nfc: Changed SVR check to allow MPC5123. (diff) | |
| parent | Linux 2.6.34-rc7 (diff) | |
| download | kernel-qcow2-linux-0ae28a35bcb7984838acbf28bfba9c030f8b74f0.tar.gz kernel-qcow2-linux-0ae28a35bcb7984838acbf28bfba9c030f8b74f0.tar.xz kernel-qcow2-linux-0ae28a35bcb7984838acbf28bfba9c030f8b74f0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
Diffstat (limited to 'drivers/mtd/maps/bfin-async-flash.c')
| -rw-r--r-- | drivers/mtd/maps/bfin-async-flash.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c index 5824fd49800c..85dd18193cf2 100644 --- a/drivers/mtd/maps/bfin-async-flash.c +++ b/drivers/mtd/maps/bfin-async-flash.c @@ -22,6 +22,7 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> #include <linux/platform_device.h> +#include <linux/slab.h> #include <linux/types.h> #include <asm/blackfin.h> |