summaryrefslogtreecommitdiffstats
path: root/baseconfig/x86
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 /baseconfig/x86
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 'baseconfig/x86')
-rw-r--r--baseconfig/x86/CONFIG_I2C_PXA1
-rw-r--r--baseconfig/x86/CONFIG_I2C_PXA_SLAVE1
2 files changed, 2 insertions, 0 deletions
diff --git a/baseconfig/x86/CONFIG_I2C_PXA b/baseconfig/x86/CONFIG_I2C_PXA
new file mode 100644
index 000000000..59d18f0cb
--- /dev/null
+++ b/baseconfig/x86/CONFIG_I2C_PXA
@@ -0,0 +1 @@
+CONFIG_I2C_PXA=m
diff --git a/baseconfig/x86/CONFIG_I2C_PXA_SLAVE b/baseconfig/x86/CONFIG_I2C_PXA_SLAVE
new file mode 100644
index 000000000..7cc440320
--- /dev/null
+++ b/baseconfig/x86/CONFIG_I2C_PXA_SLAVE
@@ -0,0 +1 @@
+# CONFIG_I2C_PXA_SLAVE is not set