diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2017-03-26 21:16:08 +0100 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2017-03-26 21:16:08 +0100 |
commit | b55a6deb27aa3ec53ac5f6f1a26bfd81f4e1456d (patch) | |
tree | 36e1c38c55601246c19cca0d3efee1f4a8ba2110 /kernel-armv7hl.config | |
parent | d9590581bcb0712ca9647c38c55c9cdb02be2f67 (diff) | |
download | kernel-b55a6deb27aa3ec53ac5f6f1a26bfd81f4e1456d.tar.gz kernel-b55a6deb27aa3ec53ac5f6f1a26bfd81f4e1456d.tar.xz kernel-b55a6deb27aa3ec53ac5f6f1a26bfd81f4e1456d.zip |
Fix null pointer dereference in bcm2835 MMC driver, Minor updates
Diffstat (limited to 'kernel-armv7hl.config')
-rw-r--r-- | kernel-armv7hl.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 7215da28e..6db1bb12e 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3295,7 +3295,6 @@ CONFIG_MOUSE_ELAN_I2C_SMBUS=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y # CONFIG_MOUSE_PS2_TOUCHKIT is not set -# CONFIG_MOUSE_PS2_VMMOUSE is not set CONFIG_MOUSE_PS2=y CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_SYNAPTICS_I2C=m @@ -4722,7 +4721,7 @@ CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_MV=m CONFIG_RTC_DRV_MXC=m -CONFIG_RTC_DRV_OMAP=y +CONFIG_RTC_DRV_OMAP=m CONFIG_RTC_DRV_PALMAS=m CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m |