[IA64] Manual merge fix for 3 files

	arch/ia64/Kconfig
	arch/ia64/kernel/acpi.c
	include/asm-ia64/irq.h

Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 15 insertions, 6 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index ed78d24ee426..5e817902cb3b 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -382,10 +382,8 @@ config QUOTA
           usage (also called disk quotas). Currently, it works for the
           ext2, ext3, and reiserfs file system. ext3 also supports journalled
           quotas for which you don't need to run quotacheck(8) after an unclean
-          shutdown. You need additional software in order to use quota support
-          (you can download sources from
-          <http://www.sf.net/projects/linuxquota/>). For further details, read
-          the Quota mini-HOWTO, available from
+          shutdown.
+          For further details, read the Quota mini-HOWTO, available from
           <http://www.tldp.org/docs.html#howto>, or the documentation provided
           with the quota tools. Probably the quota support is only useful for
           multi user systems. If unsure, say N.
@@ -403,8 +401,7 @@ config QFMT_V2
         depends on QUOTA
         help
           This quota format allows using quotas with 32-bit UIDs/GIDs. If you
-          need this functionality say Y here. Note that you will need recent
-          quota utilities (>= 3.01) for new quota format with this kernel.
+          need this functionality say Y here.
 
 config QUOTACTL
         bool
@@ -816,6 +813,18 @@ config RAMFS
           To compile this as a module, choose M here: the module will be called
           ramfs.
 
+config RELAYFS_FS
+        tristate "Relayfs file system support"
+        ---help---
+          Relayfs is a high-speed data relay filesystem designed to provide
+          an efficient mechanism for tools and facilities to relay large
+          amounts of data from kernel space to user space.
+
+          To compile this code as a module, choose M here: the module will be
+          called relayfs.
+
+          If unsure, say N.
+
 endmenu
 
 menu "Miscellaneous filesystems"