24 files changed, 45 insertions, 159 deletions

diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt
index d221781daba..c7a2eb8450c 100644
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
@@ -127,7 +127,7 @@ in the bash (as said, 1000 is default), do:
 echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) \
     >ondemand/sampling_rate
 
-show_sampling_rate_min:
+sampling_rate_min:
 The sampling rate is limited by the HW transition latency:
 transition_latency * 100
 Or by kernel restrictions:
@@ -140,8 +140,6 @@ HZ=100:  min=200000us (200ms)
 The highest value of kernel and HW latency restrictions is shown and
 used as the minimum sampling rate.
 
-show_sampling_rate_max: THIS INTERFACE IS DEPRECATED, DON'T USE IT.
-
 up_threshold: defines what the average CPU usage between the samplings
 of 'sampling_rate' needs to be for the kernel to make a decision on
 whether it should increase the frequency.  For example when it is set
diff --git a/Documentation/scsi/53c700.txt b/Documentation/scsi/53c700.txt
index 0da681d497a..e31aceb6df1 100644
--- a/Documentation/scsi/53c700.txt
+++ b/Documentation/scsi/53c700.txt
@@ -16,32 +16,13 @@ fill in to get the driver working.
 Compile Time Flags
 ==================
 
-The driver may be either io mapped or memory mapped.  This is
-selectable by configuration flags:
-
-CONFIG_53C700_MEM_MAPPED
-
-define if the driver is memory mapped.
-
-CONFIG_53C700_IO_MAPPED
-
-define if the driver is to be io mapped.
-
-One or other of the above flags *must* be defined.
-
-Other flags are:
+A compile time flag is:
 
 CONFIG_53C700_LE_ON_BE
 
 define if the chipset must be supported in little endian mode on a big
 endian architecture (used for the 700 on parisc).
 
-CONFIG_53C700_USE_CONSISTENT
-
-allocate consistent memory (should only be used if your architecture
-has a mixture of consistent and inconsistent memory).  Fully
-consistent or fully inconsistent architectures should not define this.
-
 
 Using the Chip Core Driver
 ==========================
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 44789eff983..98975f58e19 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1133,10 +1133,9 @@ config IWMMXT
           Enable support for iWMMXt context switching at run time if
           running on a CPU that supports it.
 
-#  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER
 config XSCALE_PMU
         bool
-        depends on CPU_XSCALE && !XSCALE_PMU_TIMER
+        depends on CPU_XSCALE
         default y
 
 config CPU_HAS_PMU
diff --git a/arch/arm/mach-pxa/colibri-pxa270-income.c b/arch/arm/mach-pxa/colibri-pxa270-income.c
index 80538b8806e..248804bb2c9 100644
--- a/arch/arm/mach-pxa/colibri-pxa270-income.c
+++ b/arch/arm/mach-pxa/colibri-pxa270-income.c
@@ -183,7 +183,7 @@ static inline void income_lcd_init(void) {}
 /******************************************************************************
  * Backlight
  ******************************************************************************/
-#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM__MODULE)
+#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE)
 static struct platform_pwm_backlight_data income_backlight_data = {
         .pwm_id         = 0,
         .max_brightness = 0x3ff,
diff --git a/arch/cris/Kconfig.debug b/arch/cris/Kconfig.debug
index 0b9a630dc81..14881e81e8a 100644
--- a/arch/cris/Kconfig.debug
+++ b/arch/cris/Kconfig.debug
@@ -1,6 +1,5 @@
 menu "Kernel hacking"
 
-#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
 config PROFILING
         bool "Kernel profiling support"
 
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index bad27a6ff40..c5e69abb488 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -341,16 +341,6 @@ source "drivers/pci/Kconfig"
 
 source "drivers/pcmcia/Kconfig"
 
-#config MATH_EMULATION
-#       bool "Math emulation support (EXPERIMENTAL)"
-#       depends on EXPERIMENTAL
-#       help
-#         At some point in the future, this will cause floating-point math
-#         instructions to be emulated by the kernel on machines that lack a
-#         floating-point math coprocessor.  Thrill-seekers and chronically
-#         sleep-deprived psychotic hacker types can say Y now, everyone else
-#         should probably wait a while.
-
 menu "Power management options"
 
 config ARCH_SUSPEND_POSSIBLE
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d46f1da18a3..c72bf8dc9a6 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2369,10 +2369,6 @@ config TC
           Linux driver support status is documented at:
           <http://www.linux-mips.org/wiki/DECstation>
 
-#config ACCESSBUS
-#       bool "Access.Bus support"
-#       depends on TC
-
 config MMU
         bool
         default y
diff --git a/arch/mips/sgi-ip27/Kconfig b/arch/mips/sgi-ip27/Kconfig
index bc5e9769bb7..4b2ea282b9c 100644
--- a/arch/mips/sgi-ip27/Kconfig
+++ b/arch/mips/sgi-ip27/Kconfig
@@ -1,9 +1,3 @@
-#config SGI_SN0_XXL
-#       bool "IP27 XXL"
-#       depends on SGI_IP27
-#         This options adds support for userspace processes up to 16TB size.
-#         Normally the limit is just .5TB.
-
 choice
         prompt "Node addressing mode"
         depends on SGI_IP27
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index 153022971da..bd69cf8d822 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -1,19 +1,3 @@
-#config BUBINGA
-#       bool "Bubinga"
-#       depends on 40x
-#       default n
-#       select 405EP
-#       help
-#         This option enables support for the IBM 405EP evaluation board.
-
-#config CPCI405
-#       bool "CPCI405"
-#       depends on 40x
-#       default n
-#       select 405GP
-#       help
-#         This option enables support for the CPCI405 board.
-
 config ACADIA
         bool "Acadia"
         depends on 40x
@@ -65,14 +49,6 @@ config MAKALU
         help
           This option enables support for the AMCC PPC405EX board.
 
-#config SYCAMORE
-#       bool "Sycamore"
-#       depends on 40x
-#       default n
-#       select 405GPR
-#       help
-#         This option enables support for the IBM PPC405GPr evaluation board.
-
 config WALNUT
         bool "Walnut"
         depends on 40x
@@ -172,17 +148,3 @@ config IBM405_ERR77
 # All 40x-based cores, up until the 405GPR and 405EP have this errata.
 config IBM405_ERR51
         bool
-
-#config BIOS_FIXUP
-#       bool
-#       depends on BUBINGA || EP405 || SYCAMORE || WALNUT
-#       default y
-
-#config PPC4xx_DMA
-#       bool "PPC4xx DMA controller support"
-#       depends on 4xx
-
-#config PPC4xx_EDMA
-#       bool
-#       depends on !STB03xxx && PPC4xx_DMA
-#       default y
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 762322ce24a..0cb8899a5cc 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -75,7 +75,7 @@ config KATMAI
         select PCI
         select PPC4xx_PCI_EXPRESS
         select PCI_MSI
-        select PCC4xx_MSI
+        select PPC4xx_MSI
         help
           This option enables support for the AMCC PPC440SPe evaluation board.
 
@@ -197,22 +197,6 @@ config ICON
         help
           This option enables support for the AMCC PPC440SPe evaluation board.
 
-#config LUAN
-#       bool "Luan"
-#       depends on 44x
-#       default n
-#       select 440SP
-#       help
-#         This option enables support for the IBM PPC440SP evaluation board.
-
-#config OCOTEA
-#       bool "Ocotea"
-#       depends on 44x
-#       default n
-#       select 440GX
-#       help
-#         This option enables support for the IBM PPC440GX evaluation board.
-
 config XILINX_VIRTEX440_GENERIC_BOARD
         bool "Generic Xilinx Virtex 5 FXT board support"
         depends on 44x
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index a9fbd43395f..7014cfc66d2 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -87,7 +87,6 @@ config S390
         select HAVE_KERNEL_LZMA
         select HAVE_KERNEL_LZO
         select HAVE_KERNEL_XZ
-        select HAVE_GET_USER_PAGES_FAST
         select HAVE_ARCH_MUTEX_CPU_RELAX
         select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
         select HAVE_RCU_TABLE_FREE if SMP
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 527a857d10b..ae9c3ceb286 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -329,7 +329,6 @@ config CRYPTO_CRC32C_INTEL
 
 config CRYPTO_GHASH
         tristate "GHASH digest algorithm"
-        select CRYPTO_SHASH
         select CRYPTO_GF128MUL
         help
           GHASH is message digest algorithm for GCM (Galois/Counter Mode).
@@ -477,7 +476,6 @@ config CRYPTO_WP512
 config CRYPTO_GHASH_CLMUL_NI_INTEL
         tristate "GHASH digest algorithm (CLMUL-NI accelerated)"
         depends on X86 && 64BIT
-        select CRYPTO_SHASH
         select CRYPTO_CRYPTD
         help
           GHASH is message digest algorithm for GCM (Galois/Counter Mode).
diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
index a5da732fe5b..4184e0171f0 100644
--- a/drivers/edac/i82975x_edac.c
+++ b/drivers/edac/i82975x_edac.c
@@ -277,11 +277,9 @@ static void i82975x_get_error_info(struct mem_ctl_info *mci,
 static int i82975x_process_error_info(struct mem_ctl_info *mci,
                 struct i82975x_error_info *info, int handle_errors)
 {
-        int row, multi_chan, chan;
+        int row, chan;
         unsigned long offst, page;
 
-        multi_chan = mci->csrows[0].nr_channels - 1;
-
         if (!(info->errsts2 & 0x0003))
                 return 0;
 
@@ -294,20 +292,30 @@ static int i82975x_process_error_info(struct mem_ctl_info *mci,
         }
 
         page = (unsigned long) info->eap;
-        if (info->xeap & 1)
-                page |= 0x100000000ul;
-        chan = page & 1;
         page >>= 1;
-        offst = page & ((1 << PAGE_SHIFT) - 1);
-        page >>= PAGE_SHIFT;
+        if (info->xeap & 1)
+                page |= 0x80000000;
+        page >>= (PAGE_SHIFT - 1);
         row = edac_mc_find_csrow_by_page(mci, page);
 
+        if (row == -1)  {
+                i82975x_mc_printk(mci, KERN_ERR, "error processing EAP:\n"
+                        "\tXEAP=%u\n"
+                        "\t EAP=0x%08x\n"
+                        "\tPAGE=0x%08x\n",
+                        (info->xeap & 1) ? 1 : 0, info->eap, (unsigned int) page);
+                return 0;
+        }
+        chan = (mci->csrows[row].nr_channels == 1) ? 0 : info->eap & 1;
+        offst = info->eap
+                        & ((1 << PAGE_SHIFT) -
+                                (1 << mci->csrows[row].grain));
+
         if (info->errsts & 0x0002)
                 edac_mc_handle_ue(mci, page, offst , row, "i82975x UE");
         else
                 edac_mc_handle_ce(mci, page, offst, info->derrsyn, row,
-                                multi_chan ? chan : 0,
-                                "i82975x CE");
+                                chan, "i82975x CE");
 
         return 1;
 }
@@ -410,7 +418,7 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
                 csrow->last_page = cumul_size - 1;
                 csrow->nr_pages = cumul_size - last_cumul_size;
                 last_cumul_size = cumul_size;
-                csrow->grain = 1 << 6;  /* I82975X_EAP has 64B resolution */
+                csrow->grain = 1 << 7;  /* 128Byte cache-line resolution */
                 csrow->mtype = MEM_DDR2; /* I82975x supports only DDR2 */
                 csrow->dtype = i82975x_dram_type(mch_window, index);
                 csrow->edac_mode = EDAC_SECDED; /* only supported */
diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig
index 553a9905299..62026493634 100644
--- a/drivers/parisc/Kconfig
+++ b/drivers/parisc/Kconfig
@@ -108,13 +108,6 @@ config IOMMU_HELPER
         depends on IOMMU_SBA || IOMMU_CCIO
         default y
 
-#config PCI_EPIC
-#       bool "EPIC/SAGA PCI support"
-#       depends on PCI
-#       default y
-#       help
-#         Say Y here for V-class PCI, DMA/IOMMU, IRQ subsystem support.
-
 source "drivers/pcmcia/Kconfig"
 
 source "drivers/pci/hotplug/Kconfig"
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 2209e354f53..c2d11fef114 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -66,8 +66,6 @@ config SGI_NEWPORT_CONSOLE
           Say Y here if you want the console on the Newport aka XL graphics
           card of your Indy.  Most people say Y here.
 
-#  bool 'IODC console' CONFIG_IODC_CONSOLE
-
 config DUMMY_CONSOLE
         bool
         depends on VGA_CONSOLE!=y || SGI_NEWPORT_CONSOLE!=y 
diff --git a/fs/namespace.c b/fs/namespace.c
index e5e1c7d1839..10a426c6a70 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -352,9 +352,7 @@ int mnt_want_write(struct vfsmount *mnt)
         if (__mnt_is_readonly(mnt)) {
                 mnt_dec_writers(mnt);
                 ret = -EROFS;
-                goto out;
         }
-out:
         preempt_enable();
         return ret;
 }
diff --git a/include/linux/cordic.h b/include/linux/cordic.h
index f932093e20c..cf68ca4a508 100644
--- a/include/linux/cordic.h
+++ b/include/linux/cordic.h
@@ -35,8 +35,8 @@ struct cordic_iq {
  * @theta: angle in degrees for which i/q coordinate is to be calculated.
  * @coord: function output parameter holding the i/q coordinate.
  *
- * The function calculates the i/q coordinate for a given angle using
- * cordic algorithm. The coordinate consists of a real (i) and an
+ * The function calculates the i/q coordinate for a given angle using the
+ * CORDIC algorithm. The coordinate consists of a real (i) and an
  * imaginary (q) part. The real part is essentially the cosine of the
  * angle and the imaginary part is the sine of the angle. The returned
  * values are scaled by 2^16 for precision. The range for theta is
diff --git a/include/linux/security.h b/include/linux/security.h
index 19d8e04e168..94c35336b86 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -186,7 +186,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  * Security module identifier.
  *
  * @name:
- *      A string that acts as a unique identifeir for the LSM with max number
+ *      A string that acts as a unique identifier for the LSM with max number
  *      of characters = SECURITY_NAME_MAX.
  *
  * Security hooks for program execution operations.
@@ -275,7 +275,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      @copy copied data which will be passed to the security module.
  *      Returns 0 if the copy was successful.
  * @sb_remount:
- *      Extracts security system specifc mount options and verifys no changes
+ *      Extracts security system specific mount options and verifies no changes
  *      are being made to those options.
  *      @sb superblock being remounted
  *      @data contains the filesystem-specific data.
@@ -380,15 +380,15 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      Return 0 if permission is granted.
  * @inode_mkdir:
  *      Check permissions to create a new directory in the existing directory
- *      associated with inode strcture @dir.
- *      @dir containst the inode structure of parent of the directory to be created.
+ *      associated with inode structure @dir.
+ *      @dir contains the inode structure of parent of the directory to be created.
  *      @dentry contains the dentry structure of new directory.
  *      @mode contains the mode of new directory.
  *      Return 0 if permission is granted.
  * @path_mkdir:
  *      Check permissions to create a new directory in the existing directory
- *      associated with path strcture @path.
- *      @dir containst the path structure of parent of the directory
+ *      associated with path structure @path.
+ *      @dir contains the path structure of parent of the directory
  *      to be created.
  *      @dentry contains the dentry structure of new directory.
  *      @mode contains the mode of new directory.
@@ -578,7 +578,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      @file contains the file structure.
  *      @cmd contains the operation to perform.
  *      @arg contains the operational arguments.
- *      Check permission for an ioctl operation on @file.  Note that @arg can
+ *      Check permission for an ioctl operation on @file.  Note that @arg
  *      sometimes represents a user space pointer; in other cases, it may be a
  *      simple integer value.  When @arg represents a user space pointer, it
  *      should never be used by the security module.
@@ -606,7 +606,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      Return 0 if permission is granted.
  * @file_fcntl:
  *      Check permission before allowing the file operation specified by @cmd
- *      from being performed on the file @file.  Note that @arg can sometimes
+ *      from being performed on the file @file.  Note that @arg sometimes
  *      represents a user space pointer; in other cases, it may be a simple
  *      integer value.  When @arg represents a user space pointer, it should
  *      never be used by the security module.
@@ -793,7 +793,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      information can be saved using the eff_cap field of the
  *      netlink_skb_parms structure.  Also may be used to provide fine
  *      grained control over message transmission.
- *      @sk associated sock of task sending the message.,
+ *      @sk associated sock of task sending the message.
  *      @skb contains the sk_buff structure for the netlink message.
  *      Return 0 if the information was successfully saved and message
  *      is allowed to be transmitted.
@@ -1080,9 +1080,9 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      should free it.
  *      @key points to the key to be queried.
  *      @_buffer points to a pointer that should be set to point to the
- *       resulting string (if no label or an error occurs).
+ *      resulting string (if no label or an error occurs).
  *      Return the length of the string (including terminating NUL) or -ve if
- *      an error.
+ *      an error.
  *      May also return 0 (and a NULL buffer pointer) if there is no label.
  *
  * Security hooks affecting all System V IPC operations.
@@ -1268,7 +1268,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      credentials.
  *      @tsk contains the task_struct for the process.
  *      @cred contains the credentials to use.
- *      @ns contains the user namespace we want the capability in
+ *      @ns contains the user namespace we want the capability in
  *      @cap contains the capability <include/linux/capability.h>.
  *      @audit: Whether to write an audit message or not
  *      Return 0 if the capability is granted for @tsk.
@@ -1370,7 +1370,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      @ctxlen contains the length of @ctx.
  *
  * @inode_getsecctx:
- *      Returns a string containing all relavent security context information
+ *      Returns a string containing all relevant security context information
  *
  *      @inode we wish to get the security context of.
  *      @ctx is a pointer in which to place the allocated security context.
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 67ce837ae52..63c16254e44 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1289,7 +1289,7 @@ EXPORT_SYMBOL(free_irq);
  *      and to set up the interrupt handler in the right order.
  *
  *      If you want to set up a threaded irq handler for your device
- *      then you need to supply @handler and @thread_fn. @handler ist
+ *      then you need to supply @handler and @thread_fn. @handler is
  *      still called in hard interrupt context and has to check
  *      whether the interrupt originates from the device. If yes it
  *      needs to disable the interrupt on the device and return
diff --git a/lib/Kconfig b/lib/Kconfig
index 32f3e5ae2be..d971366b8de 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -270,10 +270,9 @@ config AVERAGE
           If unsure, say N.
 
 config CORDIC
-        tristate "Cordic function"
+        tristate "CORDIC algorithm"
         help
-          The option provides arithmetic function using cordic algorithm
-          so its calculations are in fixed point. Modules can select this
-          when they require this function. Module will be called cordic.
+          This option provides an implementation of the CORDIC algorithm;
+          calculations are in fixed point. Module will be called cordic.
 
 endmenu
diff --git a/lib/cordic.c b/lib/cordic.c
index aa27a88d7e0..6cf477839eb 100644
--- a/lib/cordic.c
+++ b/lib/cordic.c
@@ -96,6 +96,6 @@ struct cordic_iq cordic_calc_iq(s32 theta)
 }
 EXPORT_SYMBOL(cordic_calc_iq);
 
-MODULE_DESCRIPTION("Cordic functions");
+MODULE_DESCRIPTION("CORDIC algorithm");
 MODULE_AUTHOR("Broadcom Corporation");
 MODULE_LICENSE("Dual BSD/GPL");
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index cbb505ba932..251f6621435 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -163,8 +163,6 @@ config IP_PNP_RARP
           operating on your network. Read
           <file:Documentation/filesystems/nfs/nfsroot.txt> for details.
 
-# not yet ready..
-#   bool '    IP: ARP support' CONFIG_IP_PNP_ARP
 config NET_IPIP
         tristate "IP: tunneling"
         select INET_TUNNEL
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index bc6aa003860..87bf08076b1 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -141,7 +141,7 @@ perf-%pkg: FORCE
 help: FORCE
         @echo '  rpm-pkg             - Build both source and binary RPM kernel packages'
         @echo '  binrpm-pkg          - Build only the binary kernel package'
-        @echo '  deb-pkg             - Build the kernel as an deb package'
+        @echo '  deb-pkg             - Build the kernel as a deb package'
         @echo '  tar-pkg             - Build the kernel as an uncompressed tarball'
         @echo '  targz-pkg           - Build the kernel as a gzip compressed tarball'
         @echo '  tarbz2-pkg          - Build the kernel as a bzip2 compressed tarball'
diff --git a/sound/aoa/codecs/Kconfig b/sound/aoa/codecs/Kconfig
index 808eb11ebac..0c68e32834c 100644
--- a/sound/aoa/codecs/Kconfig
+++ b/sound/aoa/codecs/Kconfig
@@ -7,14 +7,6 @@ config SND_AOA_ONYX
         codec chip found in the latest Apple machines
         (most of those with digital audio output).
 
-#config SND_AOA_TOPAZ
-#       tristate "support Topaz chips"
-#       ---help---
-#       This option enables support for the Topaz (CS84xx)
-#       codec chips found in the latest Apple machines,
-#       these chips do the digital input and output on
-#       some PowerMacs.
-
 config SND_AOA_TAS
         tristate "support TAS chips"
         select I2C