summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-10-02 18:02:25 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-10-02 18:02:25 +0100
commit0e3a64e2162f971180bf1fdd91c263dbdfcfd385 (patch)
tree094b9c00b2b2f79a90aff52dd7aeaef979ae74de /drivers
parentb620cc2cd80393b9a0f9a76806cb7f9e91671dac (diff)
downloadop-kernel-dev-0e3a64e2162f971180bf1fdd91c263dbdfcfd385.zip
op-kernel-dev-0e3a64e2162f971180bf1fdd91c263dbdfcfd385.tar.gz
[ARM] Fix EBSA110 network driver link detection
EBSA110 link detection didn't read the register - it wrote it. Oops. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/arm/am79c961a.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index 9b659e3..9f6eb39 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -85,7 +85,7 @@ static inline unsigned short read_ireg(u_long base_addr, u_int reg)
u_short v;
__asm__(
"str%?h %1, [%2] @ NAT_RAP\n\t"
- "str%?h %0, [%2, #8] @ NET_IDP\n\t"
+ "ldr%?h %0, [%2, #8] @ NET_IDP\n\t"
: "=r" (v)
: "r" (reg), "r" (ISAIO_BASE + 0x0464));
return v;
OpenPOWER on IntegriCloud