summaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-08-11 17:52:00 -0700
committerDavid S. Miller <davem@davemloft.net>2018-08-11 17:52:00 -0700
commit6a92ef08a1351e4977d6acde2196fa94e9c3a660 (patch)
tree3f237980c08af76beae04a6844ad254543ca4b9f /arch/parisc
parent9a95d9c6429bb58905fdfc95da2e1b7cc3fb55b7 (diff)
parentec0c96714e7ddeda4eccaa077f5646a0fd6e371f (diff)
downloadlinux-6a92ef08a1351e4977d6acde2196fa94e9c3a660.tar.bz2
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 46f656b8fc23..e7705dde953f 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -11,7 +11,6 @@ config PARISC
select ARCH_HAS_ELF_RANDOMIZE
select ARCH_HAS_STRICT_KERNEL_RWX
select ARCH_HAS_UBSAN_SANITIZE_ALL
- select ARCH_WANTS_UBSAN_NO_NULL
select ARCH_SUPPORTS_MEMORY_FAILURE
select RTC_CLASS
select RTC_DRV_GENERIC