From: Rob Herring <[email protected]>
Remove unnecessary prom.h includes in preparation to remove implicit
includes of prom.h.
Signed-off-by: Rob Herring <[email protected]>
Cc: Wolfgang Grandegger <[email protected]>
Cc: Marc Kleine-Budde <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/net/can/grcan.c | 3 ---
drivers/net/can/sja1000/sja1000_of_platform.c | 1 -
2 files changed, 4 deletions(-)
diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index 6aa737a..ab506d6 100644
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -34,10 +34,7 @@
#include <linux/io.h>
#include <linux/can/dev.h>
#include <linux/spinlock.h>
-
#include <linux/of_platform.h>
-#include <asm/prom.h>
-
#include <linux/of_irq.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c
index 31ad339..047accd 100644
--- a/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/drivers/net/can/sja1000/sja1000_of_platform.c
@@ -44,7 +44,6 @@
#include <linux/of_platform.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
-#include <asm/prom.h>
#include "sja1000.h"
--
1.8.1.2
On 09/26/2013 08:50 PM, Rob Herring wrote:
> From: Rob Herring <[email protected]>
>
> Remove unnecessary prom.h includes in preparation to remove implicit
> includes of prom.h.
>
> Signed-off-by: Rob Herring <[email protected]>
> Cc: Wolfgang Grandegger <[email protected]>
> Cc: Marc Kleine-Budde <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
Applied to linux-can-next/testing, it will be included in my next pull
request to David Miller.
tnx,
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 |
On 09/30/2013 02:54 AM, Marc Kleine-Budde wrote:
> On 09/26/2013 08:50 PM, Rob Herring wrote:
>> From: Rob Herring <[email protected]>
>>
>> Remove unnecessary prom.h includes in preparation to remove implicit
>> includes of prom.h.
>>
>> Signed-off-by: Rob Herring <[email protected]>
>> Cc: Wolfgang Grandegger <[email protected]>
>> Cc: Marc Kleine-Budde <[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>
> Applied to linux-can-next/testing, it will be included in my next pull
> request to David Miller.
Please don't apply this. The whole series needs to be applied together.
This patch is a dependency for the rest of the series.
Rob
On 09/30/2013 03:19 PM, Rob Herring wrote:
> On 09/30/2013 02:54 AM, Marc Kleine-Budde wrote:
>> On 09/26/2013 08:50 PM, Rob Herring wrote:
>>> From: Rob Herring <[email protected]>
>>>
>>> Remove unnecessary prom.h includes in preparation to remove implicit
>>> includes of prom.h.
>>>
>>> Signed-off-by: Rob Herring <[email protected]>
>>> Cc: Wolfgang Grandegger <[email protected]>
>>> Cc: Marc Kleine-Budde <[email protected]>
>>> Cc: [email protected]
>>> Cc: [email protected]
>>
>> Applied to linux-can-next/testing, it will be included in my next pull
>> request to David Miller.
>
> Please don't apply this. The whole series needs to be applied together.
> This patch is a dependency for the rest of the series.
Okay, then add my Acked-by to this patch.
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 |