summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps/tqm8xxl.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-05 14:38:55 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-05 14:38:55 -0500
commit328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch)
tree9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /drivers/mtd/maps/tqm8xxl.c
parent9e0cb06b17be7e562cbdaba2768649f025826dc6 (diff)
parentfecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (diff)
downloadop-kernel-dev-328198acb7407301ddf6005c0fa1e04bd0c539c8.zip
op-kernel-dev-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.gz
Merge branch 'master'
Diffstat (limited to 'drivers/mtd/maps/tqm8xxl.c')
-rw-r--r--drivers/mtd/maps/tqm8xxl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c
index 995e999..4e28b97 100644
--- a/drivers/mtd/maps/tqm8xxl.c
+++ b/drivers/mtd/maps/tqm8xxl.c
@@ -27,12 +27,14 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/io.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+#include <asm/io.h>
+
#define FLASH_ADDR 0x40000000
#define FLASH_SIZE 0x00800000
#define FLASH_BANK_MAX 4
OpenPOWER on IntegriCloud