Maestro3 driver
Added a quirk entry for LEGEND ZhaoYang 3100CF.
Signed-off-by: Takashi Iwai <tiwai@suse.de>

RawMidi Midlevel
Use wai_event_interruptible_timeout() instead of deprecated
interruptible_sleep_on_timeout(). Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

ALSA Core
This properly indents the sound menu.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

RME HDSP driver
* Prevents the creation of a second midi device for cards with only
  one midi I/O
Signed-off-by: Thomas Charbonnel <thomas@undata.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

PCM Midlevel
Fix 32-bit calls to snd_pcm_channel_info().
Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

PPC PMAC driver
Fixed the forgotten caller of suspend/resume callbacks to follow
the recent PM fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Intel8x0 driver
Patch-level: High
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

Intel8x0 driver
Patch-level: High
Signed-off-by: Wei Ni <Wei.Ni@uli.com.tw>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

ALSA Core
Fix the suspend/resume callback functions to follow the last change.
(This fix was missing in the last patch.)
Signed-off-by: Takashi Iwai <tiwai@suse.de>

ALSA Core
Added the missing inclusion of linux/pm.h.
Signed-off-by: Takashi Iwai <tiwai@suse.de>

HDA Codec driver
Fixed resume callback to follow the recent change of PM callbacks.
Signed-off-by: Takashi Iwai <tiwai@suse.de>

USB USX2Y
Removed an unused variable to fix a compile warning.
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Documentation
Fixed the descriptions about suspend/resume callbacks.
The suspend callback takes pm_message_t argument, and resume takes no
extra argument now.
Signed-off-by: Takashi Iwai <tiwai@suse.de>

SA11xx UDA1341 driver,Control Midlevel,ALSA Core,Digigram VX core
ES18xx driver,OPL3SA2 driver,AD1848 driver,CS4231 driver,ATIIXP driver
ATIIXP-modem driver,CS4281 driver,ES1938 driver,ES1968 driver
Intel8x0 driver,Intel8x0-modem driver,Maestro3 driver,VIA82xx driver
VIA82xx-modem driver,ALI5451 driver,CS46xx driver,HDA Codec driver
HDA Intel driver,NM256 driver,Trident driver,YMFPCI driver
PDAudioCF driver,Digigram VX Pocket driver,PPC PMAC driver
Fixes by Pavel Machek <pavel@suse.cz>:
suspend() routines no longer get u32 as their parameter (they get
pm_message_t, which is u32 for now, but will change in 2.6.12 or
so). This fixes ALSA to notice this, and uses constants with right
types where appropriate. It results in no code changes. [Best results
will be when patching against latest -mm, you may get some warnings if
you patch it into older kernel, but it should still do the right
thing.] Please apply,
							Pavel

[In addition, suspend callback type is changed to follow to the standard
 style taking no state argument -- Takashi]
Signed-off-by: Takashi Iwai <tiwai@suse.de>

USB generic driver
use the vendor/product IDs in the state structure instead of
reading them again from the device
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

Documentation,ATIIXP-modem driver,BT87x driver,Intel8x0-modem driver
VIA82xx-modem driver
Set the default index value of modem and bt87x drivers to -2 so that
the first slot is excluded when no index option is given.
This gives other uadio drivers a chance to put them as the primary
driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Documentation,ALSA Core
Currently arguments of the 'index' option from 0 through SNDRV_CARDS-1
force a module to take the specified index. Index -1 makes the module
take the first available index. This patch extends this convention so
that a negative index value is interpreted as a bitmask of the
permitted indexes. Special cases:

    -1 0xffffffff 0 and up
    -2 0xfffffffe 1 and up
    -4 0xfffffffc 2 and up
    ...

The patch includes also corrections of ALSA-Configuration.txt document.
Signed-off-by: Thomas Hood <jdthood@yahoo.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

EMU10K1/EMU10K2 driver
Changes 'Music' to 'Synth' in mixer control names
Signed-off-by: Lee Revell <rlrevell@joe-job.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Documentation,RME HDSP driver
* init sequence cleanup and firmware upload related bugfixes
* more robust revision detection scheme
  (should transparently handle new revisions)
* allow hdsploader and the kernel fw loader to coexist
  this is useful for cardbus user who compiled the driver in-kernel
  (userspace may not be ready to upload the firmware when the card
   is probed)
* removed confusing and obsolete passthru option (was interfering
  with the mixer when opening the device for capture or playback)
  this change requires a recompile of the userspace tools against
  the patched hdsp.h
* removed confusing and obsolete line_outs_monitor module param
* made precise_ptr the default behaviour, and runtime tweakable
  (removed corresponding module param)
* add an alsa ctl to disable the use of the midi tasklet, and
  process midi data in the interrupt handler
  (using the tasklet is still the default)
  this is mainly intended for users of Ingo Molnar's RT patch
* metering fix for Multiface/Digiface users (closes ALSA BUG #0000801)
* small endianness fix
* ALSA-Configuration.txt HDSP entry update
* error messages cleanup
Signed-off-by: Thomas Charbonnel <thomas@undata.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

SA11xx UDA1341 driver,ALSA Core,ISA
Removed pm_register() and pm_unregister().
Use platform_device for suspend/resume, instead.

The current implemention is still a hack.  The whole ISA drivers should
be rewritten with a proper bus definition.
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Documentation
Removed descriptions of obsolete irq_mask and irq_list options for
vxpocket, vxp440 and pdaudiocf drivers.
Signed-off-by: Takashi Iwai <tiwai@suse.de>

RME HDSP driver
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

    
ALSA Core
Added the newline to printk error output.
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Removed include/sound/version.h~

into suse.cz:/home/perex/bk/linux-sound/work

into suse.cz:/home/perex/bk/linux-sound/linux-sound

EMU8000 driver
Use msleep() instead of schedule_timeout() to guarantee the task
delays as expected.
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Wavefront drivers
Insert set_current_state() before schedule_timeout(). Without the
insertion, schedule_timeout() returns immediately, resulting in an
effective busy-wait.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

GUS Library
Use msleep_interruptible() instead of custom wait code involving
schedule_timeout() to guarantee the task delays as expected. This also
removes a dependence on the value of HZ.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

GUS Library
Insert set_current_state() before schedule_timeout(). Without the
insertion, schedule_timeout() returns immediately.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Digigram VX core
Use msleep() instead of schedule_timeout() to guarantee the task
delays as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

RawMidi Midlevel
Use msleep instead of schedule_timeout() to guarantee the task delays
as expected. This also removes a dependence on the value of HZ.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

AC97 Codec
This patch fixes sound output on the ASUS W1000 laptop with the CMI9739
chip. It wrongly reports that it has a SPDIF in, when in fact we wish to
use the EAPD pin.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Documentation
Add warning about the consequences of adjusting the 'Input Source Select'
of VIA82xx.
Signed-off-by: Ross Kendall Axe <ross.axe@blueyonder.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

HDA Intel driver
gcc-2 complains about preprocessor directives inside a macro argument list
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

USB generic driver
add support for Yamaha UC-MX, UC-KX, CLP-175, SPX2000
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Anton Blanchard wrote:
>Your recent patch looks to break module kallsyms lookups....
>It looks like if CONFIG_KALLSYMS_ALL is set then we never look up module
>addresses.

Separate lookups for kernel and modules when CONFIG_KALLSYMS_ALL=y.
Signed-off-by: Keith Owens <kaos@ocs.com.au>
Acked-by: Chris Wedgwood <cw@f00f.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix warning:

In file included from include/asm/numa.h:5,
                 from arch/x86_64/kernel/setup64.c:27:
include/asm/numnodes.h:6:1: warning: "NODES_SHIFT" redefined
In file included from include/linux/mmzone.h:13,
                 from include/linux/gfp.h:4,
                 from include/linux/slab.h:15,
                 from include/linux/percpu.h:4,
                 from include/linux/sched.h:33,
                 from arch/x86_64/kernel/setup64.c:11:
include/linux/numa.h:11:1: warning: this is the location of the previous definition

in UP builds.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From Terence Ripperda <tripperda@nvidia.com>

When doing iounmap don't try to change_page_attr back the guard
page that ioremap added.

Since the last round of change_page_attr changes this would
trigger an BUG because the reference count on the changed pages
wouldn't match up.

The problem would be only visible on machines with >3GB of memory,
because only then the PCI memory hole is below end_pfn and
change_page_attr is used.

Fixed for both i386 and x86-64.

This was actually discovered&fixed by Andrea earlier, but I goofed up
while doing the last ioremap fixes merge and this change got lost.
Poor Terence had to debug it again. Sorry about that.

cc: andrea@suse.de
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>