[PATCH] OMAP: remove merge artifacts from the PandaBoard file

Signed-off-by: Mircea Gherzan --- arch/arm/mach-omap2/board-omap4panda.c |5 - 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 084e0a6..77ab174 100644 --- a/arch/arm/mach-omap2/board

[PATCH tilt-3.2] syslink: add a missing header to fix a build error

drivers/dsp/syslink/multicore_ipc/heap.c:36:2: error: implicit declaration of function 'BUILD_BUG_ON' Signed-off-by: Mircea Gherzan --- drivers/dsp/syslink/multicore_ipc/heap.c |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/dsp/syslink/mul

[PATCH tilt-3.2] OPP: export symbols for modules

The symbols are currently used the the omap-abe-dsp code. Signed-off-by: Mircea Gherzan --- drivers/base/power/opp.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index b1e333a..069d7e5 100644 --- a/drivers/base

[PATCH tilt-3.2] tiler: export the SiTA initializer

This way, tiler can be built as a module. Signed-off-by: Mircea Gherzan --- drivers/media/video/tiler/tcm/tcm-sita.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/media/video/tiler/tcm/tcm-sita.c b/drivers/media/video/tiler/tcm/tcm-sita.c index d0784c6

[PATCH tilt-3.2] DSS: export the omap_dss_get_def_disp symbol

Required when building DSS and the generic DPI panel driver as modules. Signed-off-by: Mircea Gherzan --- drivers/video/omap2/dss/core.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 108aa24

[PATCH] v4l/omap: fix a compilation error

Signed-off-by: Mircea Gherzan --- drivers/media/video/omap/omap_vout.c | 12 +++- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index 0d036b1..fdc1fb1 100644 --- a/drivers/media/video/omap

[PATCH 3/3] OMAP: fix a typo in the Makefile

Signed-off-by: Mircea Gherzan --- arch/arm/mach-omap2/Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 0b7014d..e9991c9 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile

[PATCH 2/3] ARM: fix compilation of timer & watchdog

Signed-off-by: Mircea Gherzan --- arch/arm/kernel/smp_twd.c |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 4464b87..b93e3ad 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -216,6

[PATCH 1/3] thermal: fix a Kconfig help section

Signed-off-by: Mircea Gherzan --- drivers/thermal/Kconfig |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index cea6ad0..55f057d 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -18,6 +18,7 @@ config