- git-arm-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     From: "pHilipp Zabel" <philipp.zabel@xxxxxxxxx>
has been removed from the -mm tree.  Its filename was
     git-arm-fix.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: From: "pHilipp Zabel" <philipp.zabel@xxxxxxxxx>


On Thu, Apr 17, 2008 at 9:41 AM, Russell King <rmk@xxxxxxxxxxxxxxxx> wrote:
> On Wed, Apr 16, 2008 at 05:15:38PM -0700, akpm@xxxxxxxxxxxxxxxxxxxx wrote:
>  > Subject: git-arm: drivers/mfd/htc-pasic3.c is arm-specific
>  > From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
>  >
>  > drivers/mfd/htc-pasic3.c:22:31: error: asm/arch/pxa-regs.h: No such file or directory
>  >
>  > Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
>  > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
>  > ---
>  >
>  >  drivers/mfd/Kconfig |    1 +
>  >  1 file changed, 1 insertion(+)
>  >
>  > diff -puN drivers/mfd/Kconfig~git-arm-drivers-mfd-htc-pasic3c-is-arm-specific drivers/mfd/Kconfig
>  > --- a/drivers/mfd/Kconfig~git-arm-drivers-mfd-htc-pasic3c-is-arm-specific
>  > +++ a/drivers/mfd/Kconfig
>  > @@ -32,6 +32,7 @@ config HTC_EGPIO
>  >
>  >  config HTC_PASIC3
>  >       tristate "HTC PASIC3 LED/DS1WM chip support"
>  > +     depends on ARM
>
>  depends on ARCH_PXA would be much better.

I'm sorry, that #include <asm/arch/pxa-regs.h> is a left-over that
slipped through the net. The four or five devices using this chip that
I know of are all PXA263/PXA272, but this would be better instead:

index 94e359b..4edc120 100644
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/mfd/htc-pasic3.c |    2 --
 1 file changed, 2 deletions(-)

diff -puN drivers/mfd/htc-pasic3.c~git-arm-fix drivers/mfd/htc-pasic3.c
--- a/drivers/mfd/htc-pasic3.c~git-arm-fix
+++ a/drivers/mfd/htc-pasic3.c
@@ -19,8 +19,6 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/htc-pasic3.h>
 
-#include <asm/arch/pxa-regs.h>
-
 struct pasic3_data {
 	void __iomem *mapping;
 	unsigned int bus_shift;
_

Patches currently in -mm which might be from philipp.zabel@xxxxxxxxx are

origin.patch
git-arm.patch
git-battery.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

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux