summaryrefslogtreecommitdiffstats
path: root/kernel-ppc64p7.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-03-26 21:16:08 +0100
committerPeter Robinson <pbrobinson@gmail.com>2017-03-26 21:16:08 +0100
commitb55a6deb27aa3ec53ac5f6f1a26bfd81f4e1456d (patch)
tree36e1c38c55601246c19cca0d3efee1f4a8ba2110 /kernel-ppc64p7.config
parentd9590581bcb0712ca9647c38c55c9cdb02be2f67 (diff)
downloadkernel-b55a6deb27aa3ec53ac5f6f1a26bfd81f4e1456d.tar.gz
kernel-b55a6deb27aa3ec53ac5f6f1a26bfd81f4e1456d.tar.xz
kernel-b55a6deb27aa3ec53ac5f6f1a26bfd81f4e1456d.zip
Fix null pointer dereference in bcm2835 MMC driver, Minor updates
Diffstat (limited to 'kernel-ppc64p7.config')
-rw-r--r--kernel-ppc64p7.config3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index c1376535f..2baf5ea37 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -1734,8 +1734,6 @@ CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
-CONFIG_I2C_PXA=m
-# CONFIG_I2C_PXA_SLAVE is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SI470X=m
@@ -2789,7 +2787,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