Merge remote-tracking branch 'parisc-hd/for-next'

diff --combined arch/parisc/Kconfig
index deb713c647f45174f5e282aa7386847dda4e9a94,73e0ac2cdc117a920487896810fb78dc342cfc82..56c9cb7c8bcf9eb16188e2d60b9bfa1a386e1dcd
--- 1/arch/parisc/Kconfig
--- 2/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@@ -1,7 -1,6 +1,7 @@@
  config PARISC
        def_bool y
        select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
 +      select ARCH_MIGHT_HAVE_PC_PARPORT
        select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_FUNCTION_TRACER if 64BIT
@@@ -288,6 -287,10 +288,10 @@@ config SYSVIPC_COMPA
        def_bool y
        depends on COMPAT && SYSVIPC
  
+ config AUDIT_ARCH
+       def_bool y
+       depends on COMPAT
+ 
  config HPUX
        bool "Support for HP-UX binaries"
        depends on !64BIT