Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 4c002ba37e5076fe726826e3a2a73deb29d25176..729cdbdf8036203d99c1b59728aedf37d7a5349f 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -5,6 +5,8 @@
 config ALPHA
        bool
        default y
 config ALPHA
        bool
        default y

+       select HAVE_IDE
+       select HAVE_OPROFILE

        help
          The Alpha is a 64-bit general-purpose processor designed and
          marketed by the Digital Equipment Corporation of blessed memory,
        help
          The Alpha is a 64-bit general-purpose processor designed and
          marketed by the Digital Equipment Corporation of blessed memory,


@@ -66,6 +68,9 @@ config AUTO_IRQ_AFFINITY
        depends on SMP
        default y
 
        depends on SMP
        default y
 

+config ARCH_SUPPORTS_AOUT
+       def_bool y
+

 source "init/Kconfig"
 
 
 source "init/Kconfig"
 
 


@@ -318,11 +323,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 

-         The PCI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't.
-

 config PCI_DOMAINS
        bool
        default y
 config PCI_DOMAINS
        bool
        default y


@@ -330,6 +330,9 @@ config PCI_DOMAINS
 config PCI_SYSCALL
        def_bool PCI
 
 config PCI_SYSCALL
        def_bool PCI
 

+config IOMMU_HELPER
+       def_bool PCI
+

 config ALPHA_CORE_AGP
        bool
        depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL
 config ALPHA_CORE_AGP
        bool
        depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL


@@ -536,8 +539,8 @@ config SMP
          singleprocessor machines. On a singleprocessor machine, the kernel
          will run faster if you say N here.
 
          singleprocessor machines. On a singleprocessor machine, the kernel
          will run faster if you say N here.
 

-         See also the <file:Documentation/smp.txt>, and the SMP-HOWTO
-         available at <http://www.tldp.org/docs.html#howto>.
+         See also the SMP-HOWTO available at
+         <http://www.tldp.org/docs.html#howto>.

 
          If you don't know what to do here, say N.
 
 
          If you don't know what to do here, say N.
 


@@ -616,6 +619,11 @@ config VERBOSE_MCHECK_ON
 
          Take the default (1) unless you want more control or more info.
 
 
          Take the default (1) unless you want more control or more info.
 

+config HZ
+       int
+       default 1200 if ALPHA_RAWHIDE
+       default 1024
+

 source "drivers/pci/Kconfig"
 source "drivers/eisa/Kconfig"
 
 source "drivers/pci/Kconfig"
 source "drivers/eisa/Kconfig"
 


@@ -654,8 +662,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

-source "kernel/Kconfig.instrumentation"
-

 source "arch/alpha/Kconfig.debug"
 
 # DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig
 source "arch/alpha/Kconfig.debug"
 
 # DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig