cpts: Fix build error caused by include of plat/clock.h

PATCH Tony Lindgren 4 participants 5 messages Dec 13, 2012 – Dec 14, 2012

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Tony Lindgren

author

2012-12-13 21:36 UTC #0 lore raw

Commit 87c0e764 (cpts: introduce time stamping code and a PTP hardware clock) mistakenly included plat/clock.h that should not be included by drivers even if it exists.

Otherwise we get the following error with at least omap2plus_defconfig:

drivers/net/ethernet/ti/cpts.c:30:24: error: plat/clock.h: No such file or directory

Signed-off-by Tony Lindgren <[email protected]

drivers/net/ethernet/ti/cpts.c +0 -2

@@ -27,8 +27,6 @@
 #include <linux/uaccess.h>
 #include <linux/workqueue.h>
 
-#include <plat/clock.h>
-
 #include "cpts.h"
 
 #ifdef CONFIG_TI_CPTS

Richard Cochran

2012-12-14 07:13 UTC #1 lore raw

Quoted 3 lines · Tony Lindgren

Commit 87c0e764 (cpts: introduce time stamping code and a PTP hardware clock) mistakenly included plat/clock.h that should not be included by drivers even if it exists.

Hasn't this already been fixed?

https://patchwork.kernel.org/patch/1810481/
http://www.spinics.net/lists/linux-omap/msg83132.html

Thanks,
Richard

Koen Kooi

2012-12-14 09:55 UTC #2 lore raw

Op 14 dec. 2012, om 08:13 heeft Richard Cochran <[email protected]> het volgende geschreven:

Quoted 9 lines · Tony Lindgren

Quoted 3 lines
Commit 87c0e764 (cpts: introduce time stamping code and a PTP hardware clock) mistakenly included plat/clock.h that should not be included by drivers even if it exists.
Hasn't this already been fixed?
https://patchwork.kernel.org/patch/1810481/
http://www.spinics.net/lists/linux-omap/msg83132.html

That patch didn't get applied, so it's still broken in Linus' tree :(

regards,

Koen

Richard Cochran

2012-12-14 11:09 UTC #3 lore raw

Quoted 8 lines · Koen Kooi

Op 14 dec. 2012, om 08:13 heeft Richard Cochran <[email protected]> het volgende geschreven:
Quoted 5 lines · Tony Lindgren
Quoted 3 lines
Commit 87c0e764 (cpts: introduce time stamping code and a PTP hardware clock) mistakenly included plat/clock.h that should not be included by drivers even if it exists.

Quoted 6 lines

Quoted 4 lines
Hasn't this already been fixed?
https://patchwork.kernel.org/patch/1810481/
http://www.spinics.net/lists/linux-omap/msg83132.html
That patch didn't get applied, so it's still broken in Linus' tree :(

In netdev's patchwork, this was marked "Not Applicable." Dave, can you possibly take this patch? If not, who should I ask next?

Thanks,
Richard

David Miller

maintainer

2012-12-14 18:18 UTC #4 lore raw

From: Richard Cochran <[email protected]>
Date: Fri, 14 Dec 2012 12:09:18 +0100

Quoted 11 lines · Koen Kooi

Quoted 10 lines
Op 14 dec. 2012, om 08:13 heeft Richard Cochran <[email protected]> het volgende geschreven:
Quoted 7 lines · Tony Lindgren
Quoted 3 lines
Commit 87c0e764 (cpts: introduce time stamping code and a PTP hardware clock) mistakenly included plat/clock.h that should not be included by drivers even if it exists.
Hasn't this already been fixed?

Quoted 7 lines

Quoted 4 lines
Quoted 2 lines
https://patchwork.kernel.org/patch/1810481/
http://www.spinics.net/lists/linux-omap/msg83132.html
That patch didn't get applied, so it's still broken in Linus' tree :(
In netdev's patchwork, this was marked "Not Applicable." Dave, can you possibly take this patch? If not, who should I ask next?

That's strange, when I look at that patch it's marked "Accepted" ;-)