Subject: + arch-sh-drivers-pci-pcie-sh7786h-remove-duplicate-sh4a_pciephyctlr.patch added to -mm tree To: geert+renesas@xxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 28 Mar 2014 13:58:32 -0700 The patch titled Subject: arch/sh/drivers/pci/pcie-sh7786.h: remove duplicate SH4A_PCIEPHYCTLR has been added to the -mm tree. Its filename is arch-sh-drivers-pci-pcie-sh7786h-remove-duplicate-sh4a_pciephyctlr.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/arch-sh-drivers-pci-pcie-sh7786h-remove-duplicate-sh4a_pciephyctlr.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/arch-sh-drivers-pci-pcie-sh7786h-remove-duplicate-sh4a_pciephyctlr.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> Subject: arch/sh/drivers/pci/pcie-sh7786.h: remove duplicate SH4A_PCIEPHYCTLR Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/sh/drivers/pci/pcie-sh7786.h | 3 --- 1 file changed, 3 deletions(-) diff -puN arch/sh/drivers/pci/pcie-sh7786.h~arch-sh-drivers-pci-pcie-sh7786h-remove-duplicate-sh4a_pciephyctlr arch/sh/drivers/pci/pcie-sh7786.h --- a/arch/sh/drivers/pci/pcie-sh7786.h~arch-sh-drivers-pci-pcie-sh7786h-remove-duplicate-sh4a_pciephyctlr +++ a/arch/sh/drivers/pci/pcie-sh7786.h @@ -145,9 +145,6 @@ /* PCIERMSGIER */ #define SH4A_PCIERMSGIER (0x004040) /* R/W - 0x0000 0000 32 */ -/* PCIEPHYCTLR */ -#define SH4A_PCIEPHYCTLR (0x010000) /* R/W - 0x0000 0000 32 */ - /* PCIEPHYADRR */ #define SH4A_PCIEPHYADRR (0x010004) /* R/W - 0x0000 0000 32 */ #define BITS_ACK (24) // Rev1.171 _ Patches currently in -mm which might be from geert+renesas@xxxxxxxxx are arch-sh-drivers-pci-pcie-sh7786h-remove-duplicate-sh4a_pciephyctlr.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html