diff --git a/[refs] b/[refs] index bbb3f7f45b72..caa7412cfe13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3bf9bc243092c53946fd6d8ebd6dc2f4e572d48 +refs/heads/master: 7ac86bf61ad570a2ef642a3f7e72274570ace9c4 diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 0697aa8ea774..8082c1d142df 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -2011,7 +2011,7 @@ config E1000_DISABLE_PACKET_SPLIT config E1000E tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" - depends on PCI + depends on PCI && (!SPARC32 || BROKEN) ---help--- This driver supports the PCI-Express Intel(R) PRO/1000 gigabit ethernet family of adapters. For PCI or PCI-X e1000 adapters,