From 647898ddeb119857ae9e11d530d9b4bd4c046656 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 22 Sep 2012 18:11:32 -0400 Subject: [PATCH] --- yaml --- r: 328059 b: refs/heads/master c: 5894bab7f452d61941a6d3215dec43221ac0be4b h: refs/heads/master i: 328057: dedb9736c29b4daceb86798e6be88f4a248862a2 328055: ad580d0a2a2845b09a6e48e523583ef270a9756c v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/i825xx/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f11ff2c658b3..42b8d728b2b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e69bebde46b5ddfb7d8f17cae66031e282ebc464 +refs/heads/master: 5894bab7f452d61941a6d3215dec43221ac0be4b diff --git a/trunk/drivers/net/ethernet/i825xx/Kconfig b/trunk/drivers/net/ethernet/i825xx/Kconfig index fed5080a6b62..959faf7388e2 100644 --- a/trunk/drivers/net/ethernet/i825xx/Kconfig +++ b/trunk/drivers/net/ethernet/i825xx/Kconfig @@ -150,7 +150,7 @@ config SUN3_82586 config ZNET tristate "Zenith Z-Note support (EXPERIMENTAL)" - depends on EXPERIMENTAL && ISA_DMA_API + depends on EXPERIMENTAL && ISA_DMA_API && X86 ---help--- The Zenith Z-Note notebook computer has a built-in network (Ethernet) card, and this is the Linux driver for it. Note that the