From patchwork Wed Jun 20 13:04:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 9504 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A66B823F2A for ; Wed, 20 Jun 2012 13:05:27 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 757EBA18343 for ; Wed, 20 Jun 2012 13:05:27 +0000 (UTC) Received: by ghbz12 with SMTP id z12so6036032ghb.11 for ; Wed, 20 Jun 2012 06:05:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=+kP6Lc6RQOOwGfpAxL+4Or/30lmlVBJyCR0LIyAi0CM=; b=mw5EtihfjZlfZQu2Z4XdrqLfPgNEwAl/197O05ztngpXR6fDUXtr6ojC3TkYGKym40 sHChTFFvJKPJGCBzYAK2DAwelw0kiV7oe4WDTLMMeyS6yF73Ed/zAAzI2JSPVSQ/uZHZ xBZF00/b04wBNcy37/PoInqGztEs3Va0SLzFtcR8AMVPNUdYd8p5XZFRqUZMMLzQ8gF4 HIzb7Q8UHmhC8B0wuAt1tmrhjeXFt2o843nBty70AcE8M7MF3LCLymugk42a5sr4MIu8 M2XepTJeLOnqOhzxqA75FPGR7PT5c12J5svLUCmIFWm6tjU2oauUhOD5jWb4n8ZZLLXb IjsQ== Received: by 10.42.210.193 with SMTP id gl1mr10445073icb.57.1340197526800; Wed, 20 Jun 2012 06:05:26 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp178890ibb; Wed, 20 Jun 2012 06:05:26 -0700 (PDT) Received: by 10.68.227.197 with SMTP id sc5mr77599182pbc.58.1340197525890; Wed, 20 Jun 2012 06:05:25 -0700 (PDT) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id rn8si195835pbc.217.2012.06.20.06.05.25 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jun 2012 06:05:25 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of hongbo.zhang@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of hongbo.zhang@linaro.org) smtp.mail=hongbo.zhang@linaro.org Received: by danh15 with SMTP id h15so11275093dan.37 for ; Wed, 20 Jun 2012 06:05:25 -0700 (PDT) Received: by 10.68.197.198 with SMTP id iw6mr74632499pbc.36.1340197525465; Wed, 20 Jun 2012 06:05:25 -0700 (PDT) Received: from stebjsxu0148.bjs.st.com ([124.127.135.94]) by mx.google.com with ESMTPS id rd7sm31856288pbc.70.2012.06.20.06.05.20 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jun 2012 06:05:24 -0700 (PDT) From: "hongbo.zhang" To: linaro-dev@lists.linaro.org Cc: patches@linaro.org, "hongbo.zhang" Subject: [PATCH 1/2] make v3.4-rc3 run on snowball Date: Wed, 20 Jun 2012 21:04:26 +0800 Message-Id: <1340197467-16867-1-git-send-email-hongbo.zhang@linaro.com> X-Mailer: git-send-email 1.7.10 X-Gm-Message-State: ALoCoQkB8pctU0drlnezIfkmQdJ7rVI8T+/+ad8ntm+SU0C08sC7fOr/YbvwnRw1YLHBlo8yDzGA From: "hongbo.zhang" --- 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