On Tuesday 09 April 2013, Stephen Rothwell wrote:
>
> - #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)
> -static void __init sdp2430_display_init(void)
> -{
> - int r;
> -
> - static struct gpio gpios[] __initdata = {
> - { SDP2430_LCD_PANEL_ENABLE_GPIO,
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-2430sdp.c between commit 3b4ece75b9e9 ("arm:
omap: board-2430: use generic dpi panel's gpio handling") from the
omap_dss2 tree and commit 5b6513d27775 ("ARM: OMAP: fix typo
"CONFIG_SMC91x_MODULE"")
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-2430sdp.c between commit 3b4ece75b9e9 (arm:
omap: board-2430: use generic dpi panel's gpio handling) from the
omap_dss2 tree and commit 5b6513d27775 (ARM: OMAP: fix typo
CONFIG_SMC91x_MODULE) from the
On Tuesday 09 April 2013, Stephen Rothwell wrote:
- #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)
-static void __init sdp2430_display_init(void)
-{
- int r;
-
- static struct gpio gpios[] __initdata = {
- { SDP2430_LCD_PANEL_ENABLE_GPIO,
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/media/platform/omap/omap_vout.c between commit 950e2fb420d5
("[media] omap_vout: use omapdss's version instead of cpu_is_*") from the
omap_dss2 tree and commit 45c3eb7d3a07 ("ARM: OMAP: Move
plat-omap/dma-omap.h to
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/media/platform/omap/omap_vout.c between commit 950e2fb420d5
([media] omap_vout: use omapdss's version instead of cpu_is_*) from the
omap_dss2 tree and commit 45c3eb7d3a07 (ARM: OMAP: Move
plat-omap/dma-omap.h to
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-davinci/devices-da8xx.c between commit 3b43ad201dea
("da8xx-fb: cleanup LCDC configurations") from the omap_dss2 tree and
commit 8e0d72d2c7a6 ("ARM: davinci: da8xx: add DA850 PRUSS support") from
the arm-soc
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-davinci/devices-da8xx.c between commit 3b43ad201dea
(da8xx-fb: cleanup LCDC configurations) from the omap_dss2 tree and
commit 8e0d72d2c7a6 (ARM: davinci: da8xx: add DA850 PRUSS support) from
the arm-soc tree.
I
* Stephen Rothwell [121126 02:58]:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/plat-omap/common.c between commit b022e17b1c7e ("OMAP: common.c:
> remove init call to vram") from the omap_dss2 tree and commit
> f583f0f2c720 ("ARM: OMAP2+: Move
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-omap/common.c between commit b022e17b1c7e ("OMAP: common.c:
remove init call to vram") from the omap_dss2 tree and commit
f583f0f2c720 ("ARM: OMAP2+: Move omap_reserve() locally to mach-omap2")
from the arm-soc
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-omap/common.c between commit b022e17b1c7e (OMAP: common.c:
remove init call to vram) from the omap_dss2 tree and commit
f583f0f2c720 (ARM: OMAP2+: Move omap_reserve() locally to mach-omap2)
from the arm-soc tree.
* Stephen Rothwell s...@canb.auug.org.au [121126 02:58]:
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-omap/common.c between commit b022e17b1c7e (OMAP: common.c:
remove init call to vram) from the omap_dss2 tree and commit
f583f0f2c720 (ARM: OMAP2+:
* Tomi Valkeinen [120924 06:12]:
> Hi Arnd,
>
> On Mon, 2012-09-24 at 12:43 +, Arnd Bergmann wrote:
> > On Monday 24 September 2012, Stephen Rothwell wrote:
> > > Today's linux-next merge of the arm-soc tree got a conflict in
> > > drivers/video/omap/lcd_ams_delta.c between commit
Hi Arnd,
On Mon, 2012-09-24 at 12:43 +, Arnd Bergmann wrote:
> On Monday 24 September 2012, Stephen Rothwell wrote:
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB1:
> > remove unnecessary
On Monday 24 September 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB1:
> remove unnecessary includes") from the tree and commit e27e35ec735f
> ("ARM: OMAP1: Move
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB1:
remove unnecessary includes") from the tree and commit e27e35ec735f
("ARM: OMAP1: Move board-ams-delta.h from plat to mach") from the arm-soc
tree.
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 (OMAPFB1:
remove unnecessary includes) from the tree and commit e27e35ec735f
(ARM: OMAP1: Move board-ams-delta.h from plat to mach) from the arm-soc
tree.
The
On Monday 24 September 2012, Stephen Rothwell wrote:
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 (OMAPFB1:
remove unnecessary includes) from the tree and commit e27e35ec735f
(ARM: OMAP1: Move board-ams-delta.h
Hi Arnd,
On Mon, 2012-09-24 at 12:43 +, Arnd Bergmann wrote:
On Monday 24 September 2012, Stephen Rothwell wrote:
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 (OMAPFB1:
remove unnecessary includes) from
* Tomi Valkeinen tomi.valkei...@ti.com [120924 06:12]:
Hi Arnd,
On Mon, 2012-09-24 at 12:43 +, Arnd Bergmann wrote:
On Monday 24 September 2012, Stephen Rothwell wrote:
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap/lcd_ams_delta.c between commit
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap2/dss/dispc.c between commit fe6a466283cf ("OMAPDSS: remove
unnecessary includes") from the omap_dss2 tree and commit 7d7e1eba7e92 ("ARM:
OMAP2+: Prepare for irqs.h removal") from the arm-soc tree.
I
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap2/dss/dispc.c between commit fe6a466283cf (OMAPDSS: remove
unnecessary includes) from the omap_dss2 tree and commit 7d7e1eba7e92 (ARM:
OMAP2+: Prepare for irqs.h removal) from the arm-soc tree.
I fixed it
22 matches
Mail list logo
