[PATCH 1/5] MIPS: ar7: remove trailing semicolon in clock.c

[PATCH 1/5] MIPS: ar7: remove trailing semicolon in clock.c

[Florian Fainelli]

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 arch/mips/ar7/clock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/ar7/clock.c b/arch/mips/ar7/clock.c
index 2ca4ada..2460f9d 100644
--- a/arch/mips/ar7/clock.c
+++ b/arch/mips/ar7/clock.c
@@ -443,7 +443,7 @@ struct clk *clk_get(struct device *dev, const char *id)
 		return &vbus_clk;
 	if (!strcmp(id, "cpu"))
 		return &cpu_clk;
-	if (!strcmp(id, "dsp"));
+	if (!strcmp(id, "dsp"))
 		return &dsp_clk;
 	if (!strcmp(id, "vbus"))
 		return &vbus_clk;
-- 
1.7.4.1

[PATCH 2/5] MIPS: ar7: remove 'space before tabs' in platform.c

[Florian Fainelli]

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 arch/mips/ar7/platform.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 7d2fab3..33ffecf 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -229,7 +229,7 @@ static struct resource cpmac_low_res[] = {
 		.name	= "irq",
 		.flags	= IORESOURCE_IRQ,
 		.start	= 27,
-		.end 	= 27,
+		.end	= 27,
 	},
 };
 
-- 
1.7.4.1

Re: [PATCH 2/5] MIPS: ar7: remove 'space before tabs' in platform.c

[Ralf Baechle]

Queued for 3.1 or 3.1.0, whatever ...

  Ralf

[PATCH 3/5] MIPS: ar7: replace __attribute__((__packed__)) with __packed

[Florian Fainelli]

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 arch/mips/ar7/prom.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c
index 23818d2..8088c6f 100644
--- a/arch/mips/ar7/prom.c
+++ b/arch/mips/ar7/prom.c
@@ -77,7 +77,7 @@ struct psp_env_chunk {
 	u16	csum;
 	u8	len;
 	char	data[11];
-} __attribute__ ((packed));
+} __packed;
 
 struct psp_var_map_entry {
 	u8	num;
-- 
1.7.4.1

Re: [PATCH 3/5] MIPS: ar7: replace __attribute__((__packed__)) with __packed

[Ralf Baechle]

Also queued for 3.1.

  Ralf

[PATCH 4/5] MIPS: ar7: use linux/reboot.h instead of asm/reboot.h

[Florian Fainelli]

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 arch/mips/ar7/setup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c
index f20b53e..819d47c 100644
--- a/arch/mips/ar7/setup.c
+++ b/arch/mips/ar7/setup.c
@@ -19,8 +19,8 @@
 #include <linux/ioport.h>
 #include <linux/pm.h>
 #include <linux/time.h>
+#include <linux/reboot.h>
 
-#include <asm/reboot.h>
 #include <asm/mach-ar7/ar7.h>
 #include <asm/mach-ar7/prom.h>
 #include <asm/mach-ar7/gpio.h>
-- 
1.7.4.1

Re: [PATCH 4/5] MIPS: ar7: use linux/reboot.h instead of asm/reboot.h

[Florian Fainelli]

On Sunday 12 June 2011 20:57:20 Florian Fainelli wrote:
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
>  arch/mips/ar7/setup.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 

Ralf, please discard this one, it's causing a build failure.
-- 
Florian

Re: [PATCH 4/5] MIPS: ar7: use linux/reboot.h instead of asm/reboot.h

[Ralf Baechle]

On Sun, Jun 12, 2011 at 08:59:57PM +0200, Florian Fainelli wrote:

> Ralf, please discard this one, it's causing a build failure.

Okay, bitbucketed.

  Ralf

[PATCH 5/5] MIPS: ar7: use linux/time.h instead of asm/time.h

[Florian Fainelli]

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 arch/mips/ar7/time.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/ar7/time.c b/arch/mips/ar7/time.c
index 22c9321..37777bf 100644
--- a/arch/mips/ar7/time.c
+++ b/arch/mips/ar7/time.c
@@ -22,8 +22,8 @@
 #include <linux/time.h>
 #include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/time.h>
 
-#include <asm/time.h>
 #include <asm/mach-ar7/ar7.h>
 
 void __init plat_time_init(void)
-- 
1.7.4.1

Re: [PATCH 5/5] MIPS: ar7: use linux/time.h instead of asm/time.h

[Florian Fainelli]

On Sunday 12 June 2011 20:57:21 Florian Fainelli wrote:
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
>  arch/mips/ar7/time.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

And this one too is causing a build failure, sorry about that.
-- 
Florian

Re: [PATCH 5/5] MIPS: ar7: use linux/time.h instead of asm/time.h

[Ralf Baechle]

On Sun, Jun 12, 2011 at 09:00:29PM +0200, Florian Fainelli wrote:

> >  arch/mips/ar7/time.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> And this one too is causing a build failure, sorry about that.

Shredded as well.

  Ralf

Re: [PATCH 1/5] MIPS: ar7: remove trailing semicolon in clock.c

[Ralf Baechle]

On Sun, Jun 12, 2011 at 08:57:17PM +0200, Florian Fainelli wrote:

> -	if (!strcmp(id, "dsp"));
> +	if (!strcmp(id, "dsp"))

Lovely ...

Applied.  Thanks,

  Ralf