Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[linux-2.6-block.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 3b9a47fe843bc8603323b77c74a1931331b773de..34407f15e6d34da57be238f69441f1dad9e60764 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1288,6 +1288,7 @@ config SYSFS_DEPRECATED_V2
 
 config RELAY
        bool "Kernel->user space relay support (formerly relayfs)"
+       select IRQ_WORK
        help
          This option enables support for relay interface support in
          certain file systems (such as debugfs).
@@ -2118,12 +2119,6 @@ config PADATA
        depends on SMP
        bool
 
-# Can be selected by architectures with broken toolchains
-# that get confused by correct const<->read_only section
-# mappings
-config BROKEN_RODATA
-       bool
-
 config ASN1
        tristate
        help