diff options
| author |   Lennert Buytenhek <buytenh@wantstofly.org> | 2005-09-15 13:00:52 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2005-09-15 13:00:52 +0100 |
| commit | 44449bbf4b051ef7bbea648602f4e21658fe2354 (patch) | |
| tree | 40f0313adaf5cc98aa1df733050c5a2353548e79 /include/asm-arm/arch-ixp2000 | |
| parent | [ARM] 2911/1: ixp2000_reg_{read,write} accessors (diff) | |
| download | linux-dev-44449bbf4b051ef7bbea648602f4e21658fe2354.tar.xz linux-dev-44449bbf4b051ef7bbea648602f4e21658fe2354.zip | |
[ARM] 2909/1: remove IXP2000_PROD_ID
Patch from Lennert Buytenhek
The intel docs call it IXP2000_PRODUCT_ID, and we have a definition
for IXP2000_PRODUCT_ID as well, so IXP2000_PROD_ID can go. It's only
used in one place.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-ixp2000')
| -rw-r--r-- | include/asm-arm/arch-ixp2000/ixp2000-regs.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-ixp2000/platform.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-arm/arch-ixp2000/ixp2000-regs.h b/include/asm-arm/arch-ixp2000/ixp2000-regs.h index 75623f81ef75..32aece069869 100644 --- a/include/asm-arm/arch-ixp2000/ixp2000-regs.h +++ b/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/include/asm-arm/arch-ixp2000/platform.h b/include/asm-arm/arch-ixp2000/platform.h index 6519498dbe25..abdcf51bd283 100644 --- a/include/asm-arm/arch-ixp2000/platform.h +++ b/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 == |