Merge tag 'v4.0-rc3' into asoc-rt5670

[karo-tx-linux.git] / fs / Kconfig.binfmt

diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index c055d56ec63d04e1773909b7291627d8ee2b3193..270c48148f7947b445cc76765481556c25b8010e 100644 (file)
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -149,13 +149,6 @@ config BINFMT_EM86
          later load the module when you want to use a Linux/Intel binary. The
          module will be called binfmt_em86. If unsure, say Y.
 
-config BINFMT_SOM
-       tristate "Kernel support for SOM binaries"
-       depends on PARISC && HPUX
-       help
-         SOM is a binary executable format inherited from HP/UX.  Say
-         Y here to be able to load and execute SOM binaries directly.
-
 config BINFMT_MISC
        tristate "Kernel support for MISC binaries"
        ---help---