From 9ee7fd477d35fed49a048d7c21435f08bea6278d Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 27 Apr 2008 06:15:42 +0100 Subject: [PATCH] --- yaml --- r: 93695 b: refs/heads/master c: 7ac86bf61ad570a2ef642a3f7e72274570ace9c4 h: refs/heads/master i: 93693: ccdd61f88aec835963459b1ebb1d6e1dfcd8c0fa 93691: 387b07d4c24b58e7f6e4199c12da3fb22e005102 93687: 5f1b8a345c90533b354e93b1505cf940c93eb077 93679: c92eff02c8e279980d88d8b9b13e367b3d151fca 93663: 0c8118642ca817f95adb23028135fdace8f7468d 93631: f8b55b1ce97b6904e8235ebd1994ee67623b21c0 93567: 8e59a7eaf50512e9f2b063cc52a83980efbdb6c4 93439: 794c84f44dcfdd5c8f765b842ca2c3f5d2af08c2 93183: d5d762b38cf41fdcfd2545b89476b494da45c3a1 v: v3 --- [refs] | 2 +- trunk/drivers/net/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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,