| Message ID | 1365500104-16480-2-git-send-email-paolo.pisati@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Apr 09, 2013 at 11:35:04AM +0200, Paolo Pisati wrote: > Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 1 + > debian.master/config/armhf/config.common.armhf | 1 + > debian.master/config/config.common.ubuntu | 1 - > debian.master/config/i386/config.common.i386 | 1 + > 4 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 815f1e7..e9b9c2f 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -60,6 +60,7 @@ CONFIG_RCU_FANOUT=64 > CONFIG_REGMAP_MMIO=m > CONFIG_REGULATOR_FIXED_VOLTAGE=m > CONFIG_RTC_DRV_CMOS=y > +CONFIG_RTC_DRV_PL031=m > CONFIG_RTC_DRV_TWL4030=m > # CONFIG_SATA_HIGHBANK is not set This option is actually armhf only, so if you run fdr updateconfigs it will collapse back into common.ubuntu as =y. Also you need to clear this module out of the module lists. Applied with those modifications. -apw
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 815f1e7..e9b9c2f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -60,6 +60,7 @@ CONFIG_RCU_FANOUT=64 CONFIG_REGMAP_MMIO=m CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_PL031=m CONFIG_RTC_DRV_TWL4030=m # CONFIG_SATA_HIGHBANK is not set CONFIG_SCHED_SMT=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index be7ca03..be35973 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -53,6 +53,7 @@ CONFIG_RCU_FANOUT=32 CONFIG_REGMAP_MMIO=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_TWL4030=y CONFIG_SATA_HIGHBANK=y # CONFIG_SCHED_SMT is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index e2e3232..ef7c966 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4710,7 +4710,6 @@ CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_PL030=m -CONFIG_RTC_DRV_PL031=m CONFIG_RTC_DRV_R9701=m CONFIG_RTC_DRV_RC5T583=m CONFIG_RTC_DRV_RP5C01=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 1b08238..ff6b84a 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -59,6 +59,7 @@ CONFIG_RCU_FANOUT=32 CONFIG_REGMAP_MMIO=m CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_PL031=m CONFIG_RTC_DRV_TWL4030=m # CONFIG_SATA_HIGHBANK is not set CONFIG_SCHED_SMT=y
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + 4 files changed, 3 insertions(+), 1 deletion(-)