Patchwork [U-Boot,v2,batch,3,08/17] powerpc/85xx: fix build error introduced by serdes_get_prtcl

login
register
mail settings
Submitter York Sun
Date March 25, 2013, 5:39 p.m.
Message ID <1364233180-31149-8-git-send-email-yorksun@freescale.com>
Download mbox | patch
Permalink /patch/230818/
State Accepted, archived
Delegated to: Andy Fleming
Headers show

Comments

York Sun - March 25, 2013, 5:39 p.m.
From: Shengzhou Liu <Shengzhou.Liu@freescale.com>

Removed unused declare serdes_get_prtcl() which was no longer needed.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
---
 arch/powerpc/include/asm/fsl_serdes.h |    1 -
 1 file changed, 1 deletion(-)
Andy Fleming - May 13, 2013, 10:56 p.m.
Hmmm... I see this is going to be a common thread for these patches...


On Mon, Mar 25, 2013 at 12:39 PM, York Sun <yorksun@freescale.com> wrote:

> From: Shengzhou Liu <Shengzhou.Liu@freescale.com>
>
> Removed unused declare serdes_get_prtcl() which was no longer needed.
>
> Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
>


This is added by the patch RIGHT BEFORE it, so it would have been trivial
to squash. We cannot apply known-bad patches. I SHOULD just reject both of
them, and ask for a new version, but I will just fix this one up by hand.

Andy

Patch

diff --git a/arch/powerpc/include/asm/fsl_serdes.h b/arch/powerpc/include/asm/fsl_serdes.h
index c462455..6cd7379 100644
--- a/arch/powerpc/include/asm/fsl_serdes.h
+++ b/arch/powerpc/include/asm/fsl_serdes.h
@@ -91,7 +91,6 @@  enum srds {
 
 int is_serdes_configured(enum srds_prtcl device);
 void fsl_serdes_init(void);
-enum srds_prtcl serdes_get_prtcl(int serdes, int cfg, int lane);
 
 #ifdef CONFIG_FSL_CORENET
 #ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2