[PATCH] net: sched: enable CAN Identifier to be build into kernel

[PATCH] net: sched: enable CAN Identifier to be build into kernel

[Marc Kleine-Budde]

This patch makes it possible to build the CAN Identifier into the kernel, even
if the CAN support is build as a module.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Hello,

is there a nicer solution to this problem? Or remove the "&& CAN" at all?

Marc

 net/sched/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 62fb51f..235e01a 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -509,7 +509,7 @@ config NET_EMATCH_TEXT
 
 config NET_EMATCH_CANID
 	tristate "CAN Identifier"
-	depends on NET_EMATCH && CAN
+	depends on NET_EMATCH && (CAN=y || CAN=m)
 	---help---
 	  Say Y here if you want to be able to classify CAN frames based
 	  on CAN Identifier.
-- 
1.7.10.4

Re: [PATCH] net: sched: enable CAN Identifier to be build into kernel

[David Miller]

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 23 Nov 2012 11:44:57 +0100

> This patch makes it possible to build the CAN Identifier into the kernel, even
> if the CAN support is build as a module.
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Why is this so critical that you're asking me to merge this into
the 'net' tree mere days before Linus makes a release?

Re: [PATCH] net: sched: enable CAN Identifier to be build into kernel

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 807 bytes --]

On 11/23/2012 08:22 PM, David Miller wrote:
> From: Marc Kleine-Budde <mkl@pengutronix.de>
> Date: Fri, 23 Nov 2012 11:44:57 +0100
> 
>> This patch makes it possible to build the CAN Identifier into the kernel, even
>> if the CAN support is build as a module.
>>
>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> 
> Why is this so critical that you're asking me to merge this into
> the 'net' tree mere days before Linus makes a release?

Sorry my fault. I intended post that patch against net-next.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 261 bytes --]

Re: [PATCH] net: sched: enable CAN Identifier to be build into kernel

[David Miller]

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 23 Nov 2012 11:44:57 +0100

> This patch makes it possible to build the CAN Identifier into the kernel, even
> if the CAN support is build as a module.
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Applied to net-next, thanks.

> is there a nicer solution to this problem? Or remove the "&& CAN" at all?

I don't see how enabling this with CAN disabled could be
useful, so better to have the dependency there.