diff options
author | Maciej W. Rozycki <macro@linux-mips.org> | 2005-02-01 15:18:59 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:30:20 -0400 |
commit | aa0980b8090878bf42bc73a13d051a203a201d7d (patch) | |
tree | c4e411d4100a6006b0bc2945742b0ab2fa10b2e5 /arch/mips/pci/ops-bonito64.c | |
parent | bec0204dfb35cd5b91c0b34f97a481f363f6b272 (diff) |
Fixes for system controllers for Atlas/Malta core cards.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pci/ops-bonito64.c')
-rw-r--r-- | arch/mips/pci/ops-bonito64.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/mips/pci/ops-bonito64.c b/arch/mips/pci/ops-bonito64.c index 4b4e086a7eb1..dc35270b65a2 100644 --- a/arch/mips/pci/ops-bonito64.c +++ b/arch/mips/pci/ops-bonito64.c | |||
@@ -1,6 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Carsten Langgaard, carstenl@mips.com | 2 | * Copyright (C) 1999, 2000, 2004 MIPS Technologies, Inc. |
3 | * Copyright (C) 1999, 2000 MIPS Technologies, Inc. All rights reserved. | 3 | * All rights reserved. |
4 | * Authors: Carsten Langgaard <carstenl@mips.com> | ||
5 | * Maciej W. Rozycki <macro@mips.com> | ||
4 | * | 6 | * |
5 | * This program is free software; you can distribute it and/or modify it | 7 | * This program is free software; you can distribute it and/or modify it |
6 | * under the terms of the GNU General Public License (Version 2) as | 8 | * under the terms of the GNU General Public License (Version 2) as |
@@ -17,7 +19,6 @@ | |||
17 | * | 19 | * |
18 | * MIPS boards specific PCI support. | 20 | * MIPS boards specific PCI support. |
19 | */ | 21 | */ |
20 | #include <linux/config.h> | ||
21 | #include <linux/types.h> | 22 | #include <linux/types.h> |
22 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
23 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
@@ -57,13 +58,6 @@ static int bonito64_pcibios_config_access(unsigned char access_type, | |||
57 | return -1; | 58 | return -1; |
58 | } | 59 | } |
59 | 60 | ||
60 | #ifdef CONFIG_MIPS_BOARDS_GEN | ||
61 | if ((busnum == 0) && (PCI_SLOT(devfn) == 17)) { | ||
62 | /* MIPS Core boards have Bonito connected as device 17 */ | ||
63 | return -1; | ||
64 | } | ||
65 | #endif | ||
66 | |||
67 | /* Clear cause register bits */ | 61 | /* Clear cause register bits */ |
68 | BONITO_PCICMD |= (BONITO_PCICMD_MABORT_CLR | | 62 | BONITO_PCICMD |= (BONITO_PCICMD_MABORT_CLR | |
69 | BONITO_PCICMD_MTABORT_CLR); | 63 | BONITO_PCICMD_MTABORT_CLR); |