Re: gitorious v3.12-rc1-n900 tree

From: Pavel Machek
Date: Tue Nov 05 2013 - 18:12:50 EST


Hi!

> > I tried pulling current linux-n900 tree from gitorious.
>
> Hi, use branch v3.12-rc5-n900 (not -rc1) and consider using
> rx51_defconfig.

rx51_defconfig works for me, thanks.

And here are fixes for the problems I hit... please apply,

Signed-off-by: Pavel Machek <pavel@xxxxxx>

diff --git a/drivers/gpu/pvr/deviceclass.c b/drivers/gpu/pvr/deviceclass.c
index 7d64376..4a3c60c 100644
--- a/drivers/gpu/pvr/deviceclass.c
+++ b/drivers/gpu/pvr/deviceclass.c
@@ -1209,7 +1209,7 @@ void PVRSRVSetDCState(u32 ui32State)
}
}

-static IMG_BOOL PVRGetDisplayClassJTable(
+IMG_BOOL PVRGetDisplayClassJTable(
struct PVRSRV_DC_DISP2SRV_KMJTABLE *psJTable)
{
psJTable->ui32TableSize = sizeof(struct PVRSRV_DC_DISP2SRV_KMJTABLE);
diff --git a/drivers/media/i2c/smia/Kconfig b/drivers/media/i2c/smia/Kconfig
index 7e136e1..ed089e4 100644
--- a/drivers/media/i2c/smia/Kconfig
+++ b/drivers/media/i2c/smia/Kconfig
@@ -1,5 +1,6 @@
config VIDEO_SMIAREGS
tristate "Generic SMIA I2C register access and register list helper"
+ depends on I2C
---help---
This allows writing and reading SMIA image sensors' I2C registers
easily.
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index f7c67d8..dcaf0c9 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -26,7 +26,7 @@ config SND_OMAP_SOC_N810

config SND_OMAP_SOC_RX51
tristate "SoC Audio support for Nokia RX-51"
- depends on SND_OMAP_SOC && (MACH_NOKIA_RX51 || COMPILE_TEST)
+ depends on SND_OMAP_SOC && I2C && (MACH_NOKIA_RX51 || COMPILE_TEST)
select SND_OMAP_SOC_MCBSP
select SND_SOC_TLV320AIC3X
select SND_SOC_TPA6130A2

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/