Skip to contentSkip to conversation

dspbridge: 2.6.33 migration patches

PATCH Applied Omar Ramirez Luna 1 participant 5 messages Mar 18, 2010 – Mar 23, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover dspbridge: 2.6.33 migration patches

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(-)
#1 lore raw

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

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

---
 arch/arm/plat-omap/include/dspbridge/host_os.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/plat-omap/include/dspbridge/host_os.h +0 -1
index 00ea285..92b12de 100644
@@ -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>
Signature · 1 line
1.6.2.4
#2 lore raw

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

Fix header locations, replaced mach to plat

---
 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(-)
arch/arm/mach-omap2/dspbridge.c +1 -1
index ea109a3..4150896 100644
@@ -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>
arch/arm/plat-omap/include/dspbridge/host_os.h +1 -1
index 92b12de..faf1aaa 100644
@@ -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>
drivers/dsp/bridge/wmd/tiomap3430.c +1 -1
index 949279d..b49a965 100644
@@ -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>
Signature · 1 line
1.6.2.4
author Applied
#3 lore raw

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

Quoted 10 lines · Omar

Fix header locations, replaced mach to plat

---
  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

author Applied
#4 lore raw

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

In reply to Omar Ramirez Luna
Quoted 8 lines · Omar

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:
Quoted 9 lines

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

---
  arch/arm/plat-omap/include/dspbridge/host_os.h |    1 -
  1 files changed, 0 insertions(+), 1 deletions(-)

Pushed to dspbridge.

- omar