summaryrefslogtreecommitdiffstats
path: root/board/imx21ads
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-03-03 08:59:11 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2010-03-03 08:59:11 +0100
commit9569fc367052394ae3fd75242993cd2a2425fee8 (patch)
treec74d859e54dbd5017a8bb1495497643f4c34b743 /board/imx21ads
parentaf0ee369c1fa0932188d7d47940c0b0de108432d (diff)
parent7736782fef70485faec9040605987fd895ec095c (diff)
downloadbarebox-9569fc367052394ae3fd75242993cd2a2425fee8.tar.gz
barebox-9569fc367052394ae3fd75242993cd2a2425fee8.tar.xz
Merge branch 'next'
Diffstat (limited to 'board/imx21ads')
-rw-r--r--board/imx21ads/imx21ads.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/board/imx21ads/imx21ads.c b/board/imx21ads/imx21ads.c
index ba67e462ba..88dcfb296e 100644
--- a/board/imx21ads/imx21ads.c
+++ b/board/imx21ads/imx21ads.c
@@ -23,7 +23,6 @@
#include <common.h>
#include <net.h>
-#include <cfi_flash.h>
#include <init.h>
#include <environment.h>
#include <mach/imx-regs.h>