| commit | d19d16b4d1e2f27841e71c08b548a683a1946df4 | [log] [tgz] |
|---|---|---|
| author | nkskjames <nkskjames@gmail.com> | Thu Nov 05 12:16:04 2015 +0800 |
| committer | nkskjames <nkskjames@gmail.com> | Thu Nov 05 12:16:04 2015 +0800 |
| tree | fe1a85381898d900ef63b704f2ca080094acb83c | |
| parent | e3e5d6f9ffd8eb76b5e7444189443827c552a8d3 [diff] | |
| parent | f3e4ba18ee2be5f321b9d2372a424dfb402049f1 [diff] |
Merge pull request #67 from jk-ozlabs/kernel-i2c-updates linux-ombc: Fixes for i2c bus & device drivers
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig index 64abc65..64f097d 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
@@ -125,9 +125,6 @@ CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_SLAVE_EEPROM=y -CONFIG_I2C_DEBUG_CORE=y -CONFIG_I2C_DEBUG_ALGO=y -CONFIG_I2C_DEBUG_BUS=y CONFIG_SPI=y CONFIG_DEBUG_PINCTRL=y CONFIG_GPIO_ASPEED=y
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb index 3284fda..1d8106d 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb
@@ -10,7 +10,7 @@ LINUX_VERSION ?= "4.2" LINUX_VERSION_EXTENSION ?= "-${SRCREV}" -SRCREV="openbmc-20151102-1" +SRCREV="openbmc-20151104-1" PV = "${LINUX_VERSION}+git${SRCPV}"