git.openpandora.org
/
pandora-u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[pandora-u-boot.git]
/
drivers
/
net
/
lan91c96.h
diff --git
a/drivers/net/lan91c96.h
b/drivers/net/lan91c96.h
index
6fbb0e3
..
bef1522
100644
(file)
--- a/
drivers/net/lan91c96.h
+++ b/
drivers/net/lan91c96.h
@@
-68,7
+68,7
@@
typedef unsigned long int dword;
#define SMC_IO_EXTENT 16
-#ifdef CONFIG_
PXA250
+#ifdef CONFIG_
CPU_PXA25X
#ifdef CONFIG_LUBBOCK
#define SMC_IO_SHIFT 2
@@
-146,7
+146,7
@@
typedef unsigned long int dword;
}; \
})
-#else /* if not CONFIG_
PXA250
*/
+#else /* if not CONFIG_
CPU_PXA25X
*/
/*
* We have only 16 Bit PCMCIA access on Socket 0