summaryrefslogtreecommitdiff
path: root/cpu/ixp/npe/npe.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-02-01 21:24:38 +0100
committerWolfgang Denk <wd@denx.de>2009-02-01 21:24:38 +0100
commitf4b6f45dcba989f5a900edc07ececae80c79abdf (patch)
tree85e623dc76eba877275c5978a6527f368975abb2 /cpu/ixp/npe/npe.c
parenta87fb1b308a2a375cb9ca74ca0dd3e2c5793d3bf (diff)
parent930590f3e49c8f32256edf2e5861e1535a329c6c (diff)
downloadu-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.zip
u-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.tar.gz
u-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ixp
Diffstat (limited to 'cpu/ixp/npe/npe.c')
-rw-r--r--cpu/ixp/npe/npe.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/cpu/ixp/npe/npe.c b/cpu/ixp/npe/npe.c
index bd77fed..03e3bf7 100644
--- a/cpu/ixp/npe/npe.c
+++ b/cpu/ixp/npe/npe.c
@@ -44,8 +44,6 @@
#include <npe.h>
-#ifdef CONFIG_IXP4XX_NPE
-
static IxQMgrDispatcherFuncPtr qDispatcherFunc = NULL;
static int npe_exists[NPE_NUM_PORTS];
static int npe_used[NPE_NUM_PORTS];
@@ -690,5 +688,3 @@ int npe_initialize(bd_t * bis)
return 1;
}
-
-#endif /* CONFIG_IXP4XX_NPE */