[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20100826.203236.71085896.davem@davemloft.net>
Date: Thu, 26 Aug 2010 20:32:36 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: sfr@...b.auug.org.au
Cc: netdev@...r.kernel.org, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, peppe.cavallaro@...com
Subject: Re: linux-next: build failure after merge of the net tree
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Fri, 27 Aug 2010 11:14:00 +1000
> After merging the nert tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/net/stmmac/stmmac_timer.c: In function 'stmmac_open_ext_timer':
> drivers/net/stmmac/stmmac_timer.c:60: error: 'CONFIG_RTC_HCTOSYS_DEVICE' undeclared (first use in this function)
>
> Maybe exposed by commit ac75791aa943c7953521cb4fa7728bf51f9abd2d ("stmmac:
> remove dead option in the driver's Kconfig") since presumably we used to
> not build this driver.
Strange, it built on sparc64 for whatever reason :-)
I've just pushed the following fix to net-next-2.6, thanks.
--------------------
stmmac: Make time functionality depend upon RTC_HCTOSYS_DEVICE
Based upon a report by Stephen Rothwell.
Signed-off-by: David S. Miller <davem@...emloft.net>
---
drivers/net/stmmac/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/stmmac/Kconfig b/drivers/net/stmmac/Kconfig
index 6439680..3c2af7c 100644
--- a/drivers/net/stmmac/Kconfig
+++ b/drivers/net/stmmac/Kconfig
@@ -32,6 +32,7 @@ config STMMAC_DUAL_MAC
config STMMAC_TIMER
bool "STMMAC Timer optimisation"
default n
+ depends on RTC_HCTOSYS_DEVICE
help
Use an external timer for mitigating the number of network
interrupts. Currently, for SH architectures, it is possible
--
1.7.2.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists