Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 38980
void __init arch_init_irq(void)
{
#ifdef CONFIG_BCM47XX_BCMA
void __init arch_init_irq(void)
{
#ifdef CONFIG_BCM47XX_BCMA
-@@ -63,5 +76,16 @@ void __init arch_init_irq(void)
- cp0_compare_irq = 7;
+@@ -64,4 +77,14 @@ void __init arch_init_irq(void)
mips_cpu_irq_init();
+
+ if (cpu_has_vint) {
mips_cpu_irq_init();
+
+ if (cpu_has_vint) {
TG3_CPMU_PHY_STRAP_IS_SERDES;
if (is_serdes)
tp->phy_addr += 7;
TG3_CPMU_PHY_STRAP_IS_SERDES;
if (is_serdes)
tp->phy_addr += 7;
-+ } else if (tg3_flag(tp, IS_SSB_CORE)) {
++ } else if (tg3_flag(tp, IS_SSB_CORE) && tg3_flag(tp, ROBOSWITCH)) {
+ int addr;
+
+ addr = ssb_gige_get_phyaddr(tp->pdev);
+ int addr;
+
+ addr = ssb_gige_get_phyaddr(tp->pdev);