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 /baseconfig | |
| 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 'baseconfig')
| -rw-r--r-- | baseconfig/CONFIG_MOUSE_PS2_VMMOUSE | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP | 2 | ||||
| -rw-r--r-- | baseconfig/x86/CONFIG_I2C_PXA (renamed from baseconfig/CONFIG_I2C_PXA) | 0 | ||||
| -rw-r--r-- | baseconfig/x86/CONFIG_I2C_PXA_SLAVE (renamed from baseconfig/CONFIG_I2C_PXA_SLAVE) | 0 |
4 files changed, 1 insertions, 2 deletions
diff --git a/baseconfig/CONFIG_MOUSE_PS2_VMMOUSE b/baseconfig/CONFIG_MOUSE_PS2_VMMOUSE deleted file mode 100644 index 3941478c7..000000000 --- a/baseconfig/CONFIG_MOUSE_PS2_VMMOUSE +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MOUSE_PS2_VMMOUSE is not set diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP index 7679dbb81..479a6f546 100644 --- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP +++ b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP @@ -1 +1 @@ -CONFIG_RTC_DRV_OMAP=y +CONFIG_RTC_DRV_OMAP=m diff --git a/baseconfig/CONFIG_I2C_PXA b/baseconfig/x86/CONFIG_I2C_PXA index 59d18f0cb..59d18f0cb 100644 --- a/baseconfig/CONFIG_I2C_PXA +++ b/baseconfig/x86/CONFIG_I2C_PXA diff --git a/baseconfig/CONFIG_I2C_PXA_SLAVE b/baseconfig/x86/CONFIG_I2C_PXA_SLAVE index 7cc440320..7cc440320 100644 --- a/baseconfig/CONFIG_I2C_PXA_SLAVE +++ b/baseconfig/x86/CONFIG_I2C_PXA_SLAVE |