Message ID | 1394708649-21587-3-git-send-email-paolo.pisati@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/debian.master/abi/3.13.0-17.37/armhf/generic-lpae.modules b/debian.master/abi/3.13.0-17.37/armhf/generic-lpae.modules index 0ec5972..2fc1180 100644 --- a/debian.master/abi/3.13.0-17.37/armhf/generic-lpae.modules +++ b/debian.master/abi/3.13.0-17.37/armhf/generic-lpae.modules @@ -1285,7 +1285,6 @@ ledtrig-backlight ledtrig-camera ledtrig-default-on ledtrig-gpio -ledtrig-heartbeat ledtrig-oneshot ledtrig-timer ledtrig-transient diff --git a/debian.master/abi/3.13.0-17.37/armhf/generic.modules b/debian.master/abi/3.13.0-17.37/armhf/generic.modules index 9e7baa9..3c932a5 100644 --- a/debian.master/abi/3.13.0-17.37/armhf/generic.modules +++ b/debian.master/abi/3.13.0-17.37/armhf/generic.modules @@ -1596,7 +1596,6 @@ ledtrig-backlight ledtrig-camera ledtrig-default-on ledtrig-gpio -ledtrig-heartbeat ledtrig-oneshot ledtrig-timer ledtrig-transient diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 203853b..ab15794 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -141,6 +141,7 @@ CONFIG_KSM=y CONFIG_KVM=m CONFIG_KVM_GUEST=y CONFIG_L2TP_V3=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LIBERTAS_MESH=y CONFIG_LIS3L02DQ=m CONFIG_LOG_BUF_SHIFT=18 diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 9ce3b7e..4bb1e4b 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -98,6 +98,7 @@ CONFIG_ISO9660_FS=m # CONFIG_KSM is not set CONFIG_KVM=y CONFIG_L2TP_V3=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_LIS3L02DQ is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_MAILBOX=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 7eeb1ce..87c616e 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -124,6 +124,7 @@ CONFIG_KGDB=y # CONFIG_KSM is not set CONFIG_KVM=y CONFIG_L2TP_V3=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y # CONFIG_LIBERTAS_MESH is not set # CONFIG_LIS3L02DQ is not set CONFIG_LOG_BUF_SHIFT=17 diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index f6eff18..7912a6e 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3438,7 +3438,6 @@ CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_LEDS_TRIGGER_IDE_DISK is not set CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_TIMER=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 4713eff..53aecb1 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -140,6 +140,7 @@ CONFIG_KSM=y CONFIG_KVM=m CONFIG_KVM_GUEST=y CONFIG_L2TP_V3=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LIBERTAS_MESH=y CONFIG_LIS3L02DQ=m CONFIG_LOG_BUF_SHIFT=17 diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 8aaaff9..f416e61 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -148,6 +148,7 @@ CONFIG_KVM=y CONFIG_KVM_BOOK3S_64=m CONFIG_KVM_GUEST=y # CONFIG_L2TP_V3 is not set +CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LIBERTAS_MESH=y CONFIG_LIS3L02DQ=m CONFIG_LOG_BUF_SHIFT=17 diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 86d6a7a..77f16f2 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -158,6 +158,7 @@ CONFIG_KSM=y # CONFIG_KVM_BOOK3S_64 is not set # CONFIG_KVM_GUEST is not set CONFIG_L2TP_V3=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LOG_BUF_SHIFT=17 CONFIG_LPARCFG=y # CONFIG_MACINTOSH_DRIVERS is not set
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/abi/3.13.0-17.37/armhf/generic-lpae.modules | 1 - debian.master/abi/3.13.0-17.37/armhf/generic.modules | 1 - debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/arm64/config.common.arm64 | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 + 9 files changed, 6 insertions(+), 3 deletions(-)