[PATCH 0/2] dspbridge: 2.6.33 migration patches

[PATCH 0/2] dspbridge: 2.6.33 migration patches

[Omar Ramirez Luna]

These patches are required for the next rebase to 2.6.33 kernel.

They fix a warning and header locations for files moved from mach
to plat.

Omar Ramirez Luna (2):
  DSPBRIDGE: Remove autoconf.h dependency from host_os header
  DSPBRIDGE: Fix header locations mach to plat

 arch/arm/mach-omap2/dspbridge.c                |    2 +-
 arch/arm/plat-omap/include/dspbridge/host_os.h |    3 +--
 drivers/dsp/bridge/wmd/tiomap3430.c            |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

[PATCH 1/2] DSPBRIDGE: Remove autoconf.h dependency from host_os header

[Omar Ramirez Luna]

There shouldn't be any dependency on the definitions generated
by autoconf.h, besides it is automatically included by the
build system.

This solves the following warning:

In file included from arch/arm/plat-omap/include/dspbridge/host_os.h:20,
                 from arch/arm/mach-omap2/io.c:51:
include/linux/autoconf.h:165:1: warning: "CONFIG_DEFAULT_IOSCHED" redefined
In file included from <command-line>:0:
./include/generated/autoconf.h:172:1: warning: this is the location of the previous definition

Signed-off-by: Omar Ramirez Luna <omar.ramirez@hotmail.com>
---
 arch/arm/plat-omap/include/dspbridge/host_os.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/include/dspbridge/host_os.h b/arch/arm/plat-omap/include/dspbridge/host_os.h
index 00ea285..92b12de 100644
--- a/arch/arm/plat-omap/include/dspbridge/host_os.h
+++ b/arch/arm/plat-omap/include/dspbridge/host_os.h
@@ -17,7 +17,6 @@
 #ifndef _HOST_OS_H_
 #define _HOST_OS_H_
 
-#include <linux/autoconf.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <linux/semaphore.h>
-- 
1.6.2.4

[PATCH 2/2] DSPBRIDGE: Fix header locations mach to plat

[Omar Ramirez Luna]

Fix header locations, replaced mach to plat

Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
Acked-by: Ameya Palande <ameya.palande@nokia.com>
---
 arch/arm/mach-omap2/dspbridge.c                |    2 +-
 arch/arm/plat-omap/include/dspbridge/host_os.h |    2 +-
 drivers/dsp/bridge/wmd/tiomap3430.c            |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/dspbridge.c b/arch/arm/mach-omap2/dspbridge.c
index ea109a3..4150896 100644
--- a/arch/arm/mach-omap2/dspbridge.c
+++ b/arch/arm/mach-omap2/dspbridge.c
@@ -14,7 +14,7 @@
 #include <linux/platform_device.h>
 
 #ifdef CONFIG_BRIDGE_DVFS
-#include <mach/omap-pm.h>
+#include <plat/omap-pm.h>
 #endif
 
 #include <dspbridge/host_os.h>
diff --git a/arch/arm/plat-omap/include/dspbridge/host_os.h b/arch/arm/plat-omap/include/dspbridge/host_os.h
index 92b12de..faf1aaa 100644
--- a/arch/arm/plat-omap/include/dspbridge/host_os.h
+++ b/arch/arm/plat-omap/include/dspbridge/host_os.h
@@ -43,7 +43,7 @@
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
 #include <dspbridge/dbtype.h>
-#include <mach/clock.h>
+#include <plat/clock.h>
 #include <linux/clk.h>
 #include <linux/pagemap.h>
 #include <asm/cacheflush.h>
diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c
index 949279d..b49a965 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430.c
@@ -24,7 +24,7 @@
 #include <mach-omap2/cm.h>
 #include <mach-omap2/prm-regbits-34xx.h>
 #include <mach-omap2/cm-regbits-34xx.h>
-#include <mach/control.h>
+#include <plat/control.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
 #include <dspbridge/std.h>
-- 
1.6.2.4

Re: [PATCH 1/2] DSPBRIDGE: Remove autoconf.h dependency from host_os header

[Omar Ramirez Luna]

On 3/18/2010 4:57 PM, Ramirez Luna, Omar wrote:
> There shouldn't be any dependency on the definitions generated
> by autoconf.h, besides it is automatically included by the
> build system.
>
> This solves the following warning:
>
> In file included from arch/arm/plat-omap/include/dspbridge/host_os.h:20,
>                   from arch/arm/mach-omap2/io.c:51:
> include/linux/autoconf.h:165:1: warning: "CONFIG_DEFAULT_IOSCHED" redefined
> In file included from<command-line>:0:
> ./include/generated/autoconf.h:172:1: warning: this is the location of the previous definition
>
> Signed-off-by: Omar Ramirez Luna<omar.ramirez@hotmail.com>
> ---
>   arch/arm/plat-omap/include/dspbridge/host_os.h |    1 -
>   1 files changed, 0 insertions(+), 1 deletions(-)
>

Pushed to dspbridge.

- omar

Re: [PATCH 2/2] DSPBRIDGE: Fix header locations mach to plat

[Omar Ramirez Luna]

On 3/18/2010 4:57 PM, Ramirez Luna, Omar wrote:
> Fix header locations, replaced mach to plat
>
> Signed-off-by: Omar Ramirez Luna<omar.ramirez@ti.com>
> Acked-by: Ameya Palande<ameya.palande@nokia.com>
> ---
>   arch/arm/mach-omap2/dspbridge.c                |    2 +-
>   arch/arm/plat-omap/include/dspbridge/host_os.h |    2 +-
>   drivers/dsp/bridge/wmd/tiomap3430.c            |    2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>

Pushed to dspbridge.

- omar