Subject: [merged] arch-sh-drivers-pci-pcie-sh7786h-remove-duplicate-sh4a_pciephyctlr.patch removed from -mm tree
To: geert+renesas@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 04 Apr 2014 12:29:55 -0700
The patch titled
Subject: arch/sh/drivers/pci/pcie-sh7786.h: remove duplicate SH4A_PCIEPHYCTLR
has been removed from the -mm tree. Its filename was
arch-sh-drivers-pci-pcie-sh7786h-remove-duplicate-sh4a_pciephyctlr.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
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
origin.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
