serial/sh_sci: Fix build failure for non-sh architectures
PATCH 1/1 serial/sh_sci: Fix build failure for non-sh architectures
From: Peter Huewe <[email protected]>
This patch fixes a build failure for various arm based defconfigs [1][2][3] and maybe other architectures/configs.
The build failure was introduced by the sh specific patch [4] "serial: sh-sci: Add DMA support"
by Guennadi Liakhovetski
Patch against linux-next of 20100309
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2248992/
[2] http://kisskb.ellerman.id.au/kisskb/buildresult/2248996/
[3] http://kisskb.ellerman.id.au/kisskb/buildresult/2248998/
[4] http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=73a19e4c0301908ce6346715fd08a74308451f5a
--- include/linux/serial_sci.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
include/linux/serial_sci.h +4 -0
@@ -2,7 +2,9 @@#define __LINUX_SERIAL_SCI_H#include <linux/serial_core.h> +#ifdef CONFIG_SERIAL_SH_SCI_DMA #include <asm/dmaengine.h> +#endif /* * Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts)
@@ -30,8 +32,10 @@ struct plat_sci_port {upf_t flags;/* UPF_* flags */ char *clk;/* clock string */ struct device *dma_dev; +#ifdef CONFIG_SERIAL_SH_SCI_DMA enum sh_dmae_slave_chan_id dma_slave_tx;enum sh_dmae_slave_chan_id dma_slave_rx; +#endif };#endif /* __LINUX_SERIAL_SCI_H */
Signature · 1 line
1.6.4.4
Paul Mundt
AppliedQuoted 10 lines · Peter H?we
From: Peter Huewe <[email protected]>
This patch fixes a build failure for various arm based defconfigs [1][2][3] and maybe other architectures/configs.
The build failure was introduced by the sh specific patch [4] "serial: sh-sci: Add DMA support"
by Guennadi LiakhovetskiPatch against linux-next of 20100309
Please Cc [email protected] so these things make it in to patchwork in the future.
Quoted 8 lines
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2248992/
[2] http://kisskb.ellerman.id.au/kisskb/buildresult/2248996/
[3] http://kisskb.ellerman.id.au/kisskb/buildresult/2248998/
[4] http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=73a19e4c0301908ce6346715fd08a74308451f5aSigned-off-by Peter Huewe <[email protected]>
Applied, thanks.
Quoted 6 lines · Paul Mundt
Quoted 5 lines · Peter H?we
From: Peter Huewe <[email protected]>
This patch fixes a build failure for various arm based defconfigs [1][2][3] and maybe other architectures/configs.
Quoted 8 lines
Quoted 5 lines
The build failure was introduced by the sh specific patch [4] "serial: sh-sci: Add DMA support"
by Guennadi LiakhovetskiPatch against linux-next of 20100309
Please Cc [email protected] so these things make it in to patchwork in the future.
Ok, I understand, this breakage is only in linux-next, and only for shmobile targets, which wasn't there as I was preparing the patch. However, what I did oversee is the H8300 arch, which also uses the sh-sci.c, and they are, probably, also broken in the mainline now. So, can we, please, also schedule this for 34-rc2?
Quoted 9 lines
Quoted 7 lines
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2248992/
[2] http://kisskb.ellerman.id.au/kisskb/buildresult/2248996/
[3] http://kisskb.ellerman.id.au/kisskb/buildresult/2248998/
[4] http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=73a19e4c0301908ce6346715fd08a74308451f5aSigned-off-by Peter Huewe <[email protected]>Applied, thanks.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
Quoted 14 lines · Guennadi Liakhovetski
Quoted 12 lines · Paul Mundt
Quoted 10 lines · Peter H?we
From: Peter Huewe <[email protected]>
This patch fixes a build failure for various arm based defconfigs [1][2][3] and maybe other architectures/configs.
The build failure was introduced by the sh specific patch [4] "serial: sh-sci: Add DMA support"
by Guennadi LiakhovetskiPatch against linux-next of 20100309
Quoted 9 lines
Quoted 2 lines
Please Cc [email protected] so these things make it in to patchwork in the future.
Ok, I understand, this breakage is only in linux-next, and only for shmobile targets, which wasn't there as I was preparing the patch. However, what I did oversee is the H8300 arch, which also uses the
sh-sci.c, and they are, probably, also broken in the mainline now. So, can we, please, also schedule this for 34-rc2?
Yes, it's in my .34 queue. H8300 doesn't actually matter though, since they've never converted in-tree to using sh-sci through the driver model. It likely hasn't been tested on H8 since 2.5, so I'm not exactly losing sleep over it.