[1/2] make v3.4-rc3 run on snowball

Message ID 1340197467-16867-1-git-send-email-hongbo.zhang@linaro.com
State New
Headers show

Commit Message

Hongbo Zhang June 20, 2012, 1:04 p.m.
From: "hongbo.zhang" <hongbo.zhang@stericsson.com>

---
 arch/arm/configs/u8500_defconfig |    2 ++
 drivers/power/Makefile           |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Hongbo Zhang June 20, 2012, 1:14 p.m. | #1
Please omit this patch, I am currently working on v3.4-rc3, I will rebase
to the latest version soon.


On 20 June 2012 21:04, hongbo.zhang <hongbo.zhang@linaro.org> wrote:

> From: "hongbo.zhang" <hongbo.zhang@stericsson.com>
>
> ---
>  arch/arm/configs/u8500_defconfig |    2 ++
>  drivers/power/Makefile           |    2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/configs/u8500_defconfig
> b/arch/arm/configs/u8500_defconfig
> index 889d73a..4dc11da 100644
> --- a/arch/arm/configs/u8500_defconfig
> +++ b/arch/arm/configs/u8500_defconfig
> @@ -99,6 +99,8 @@ CONFIG_EXT2_FS_XATTR=y
>  CONFIG_EXT2_FS_POSIX_ACL=y
>  CONFIG_EXT2_FS_SECURITY=y
>  CONFIG_EXT3_FS=y
> +CONFIG_EXT4_FS=y
> +CONFIG_LBDAF=y
>  CONFIG_VFAT_FS=y
>  CONFIG_TMPFS=y
>  CONFIG_TMPFS_POSIX_ACL=y
> diff --git a/drivers/power/Makefile b/drivers/power/Makefile
> index b6b2434..e642e1c 100644
> --- a/drivers/power/Makefile
> +++ b/drivers/power/Makefile
> @@ -34,7 +34,7 @@ obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o
>  obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
>  obj-$(CONFIG_BATTERY_JZ4740)   += jz4740-battery.o
>  obj-$(CONFIG_BATTERY_INTEL_MID)        += intel_mid_battery.o
> -obj-$(CONFIG_AB8500_BM)                += ab8500_charger.o ab8500_btemp.o
> ab8500_fg.o abx500_chargalg.o
> +#obj-$(CONFIG_AB8500_BM)               += ab8500_charger.o ab8500_btemp.o
> ab8500_fg.o abx500_chargalg.o
>  obj-$(CONFIG_CHARGER_ISP1704)  += isp1704_charger.o
>  obj-$(CONFIG_CHARGER_MAX8903)  += max8903_charger.o
>  obj-$(CONFIG_CHARGER_TWL4030)  += twl4030_charger.o
> --
> 1.7.10
>
>
Hongbo Zhang June 28, 2012, 5:49 a.m. | #2
[PATCH 1/2] make v3.4-rc3 run on snowball: this patch can be omitted.
 but,
[PATCH 2/2] db8500 thermal dirver: any comments/suggestions are welcomed.

On 20 June 2012 21:14, Hongbo Zhang <hongbo.zhang@linaro.org> wrote:

> Please omit this patch, I am currently working on v3.4-rc3, I will rebase
> to the latest version soon.
>
>
>
> On 20 June 2012 21:04, hongbo.zhang <hongbo.zhang@linaro.org> wrote:
>
>> From: "hongbo.zhang" <hongbo.zhang@stericsson.com>
>>
>> ---
>>  arch/arm/configs/u8500_defconfig |    2 ++
>>  drivers/power/Makefile           |    2 +-
>>  2 files changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/configs/u8500_defconfig
>> b/arch/arm/configs/u8500_defconfig
>> index 889d73a..4dc11da 100644
>> --- a/arch/arm/configs/u8500_defconfig
>> +++ b/arch/arm/configs/u8500_defconfig
>> @@ -99,6 +99,8 @@ CONFIG_EXT2_FS_XATTR=y
>>  CONFIG_EXT2_FS_POSIX_ACL=y
>>  CONFIG_EXT2_FS_SECURITY=y
>>  CONFIG_EXT3_FS=y
>> +CONFIG_EXT4_FS=y
>> +CONFIG_LBDAF=y
>>  CONFIG_VFAT_FS=y
>>  CONFIG_TMPFS=y
>>  CONFIG_TMPFS_POSIX_ACL=y
>> diff --git a/drivers/power/Makefile b/drivers/power/Makefile
>> index b6b2434..e642e1c 100644
>> --- a/drivers/power/Makefile
>> +++ b/drivers/power/Makefile
>> @@ -34,7 +34,7 @@ obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o
>>  obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
>>  obj-$(CONFIG_BATTERY_JZ4740)   += jz4740-battery.o
>>  obj-$(CONFIG_BATTERY_INTEL_MID)        += intel_mid_battery.o
>> -obj-$(CONFIG_AB8500_BM)                += ab8500_charger.o
>> ab8500_btemp.o ab8500_fg.o abx500_chargalg.o
>> +#obj-$(CONFIG_AB8500_BM)               += ab8500_charger.o
>> ab8500_btemp.o ab8500_fg.o abx500_chargalg.o
>>  obj-$(CONFIG_CHARGER_ISP1704)  += isp1704_charger.o
>>  obj-$(CONFIG_CHARGER_MAX8903)  += max8903_charger.o
>>  obj-$(CONFIG_CHARGER_TWL4030)  += twl4030_charger.o
>> --
>> 1.7.10
>>
>>
>

Patch

diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 889d73a..4dc11da 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -99,6 +99,8 @@  CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS=y
+CONFIG_LBDAF=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index b6b2434..e642e1c 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -34,7 +34,7 @@  obj-$(CONFIG_BATTERY_S3C_ADC)	+= s3c_adc_battery.o
 obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
 obj-$(CONFIG_BATTERY_JZ4740)	+= jz4740-battery.o
 obj-$(CONFIG_BATTERY_INTEL_MID)	+= intel_mid_battery.o
-obj-$(CONFIG_AB8500_BM)		+= ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o
+#obj-$(CONFIG_AB8500_BM)		+= ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o
 obj-$(CONFIG_CHARGER_ISP1704)	+= isp1704_charger.o
 obj-$(CONFIG_CHARGER_MAX8903)	+= max8903_charger.o
 obj-$(CONFIG_CHARGER_TWL4030)	+= twl4030_charger.o