From f57d34e32d7fee64d0afbcd8eb9b6530de959e61 Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Thu, 15 Sep 2005 13:00:52 +0100 Subject: [PATCH] --- yaml --- r: 8984 b: refs/heads/master c: 44449bbf4b051ef7bbea648602f4e21658fe2354 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-ixp2000/ixp2000-regs.h | 2 -- trunk/include/asm-arm/arch-ixp2000/platform.h | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3b6c62902916..db867aadd655 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 917afce1000d978dfd3f07da5da9d864bc49c77e +refs/heads/master: 44449bbf4b051ef7bbea648602f4e21658fe2354 diff --git a/trunk/include/asm-arm/arch-ixp2000/ixp2000-regs.h b/trunk/include/asm-arm/arch-ixp2000/ixp2000-regs.h index 75623f81ef75..32aece069869 100644 --- a/trunk/include/asm-arm/arch-ixp2000/ixp2000-regs.h +++ b/trunk/include/asm-arm/arch-ixp2000/ixp2000-regs.h @@ -370,8 +370,6 @@ #define GLOBAL_REG_BASE (IXP2000_GLOBAL_REG_VIRT_BASE + 0x0a00) #define GLOBAL_REG(x) (volatile unsigned long*)(GLOBAL_REG_BASE | (x)) -#define IXP2000_PROD_ID GLOBAL_REG(0x00) - #define IXP2000_MAJ_PROD_TYPE_MASK 0x001F0000 #define IXP2000_MAJ_PROD_TYPE_IXP2000 0x00000000 #define IXP2000_MIN_PROD_TYPE_MASK 0x0000FF00 diff --git a/trunk/include/asm-arm/arch-ixp2000/platform.h b/trunk/include/asm-arm/arch-ixp2000/platform.h index 6519498dbe25..abdcf51bd283 100644 --- a/trunk/include/asm-arm/arch-ixp2000/platform.h +++ b/trunk/include/asm-arm/arch-ixp2000/platform.h @@ -88,7 +88,7 @@ void ixp2000_release_slowport(struct slowport_cfg *); */ static inline unsigned ixp2000_has_broken_slowport(void) { - unsigned long id = *IXP2000_PROD_ID; + unsigned long id = *IXP2000_PRODUCT_ID; unsigned long id_prod = id & (IXP2000_MAJ_PROD_TYPE_MASK | IXP2000_MIN_PROD_TYPE_MASK); return (((id_prod ==