Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask

Conflicts:
	arch/x86/kernel/io_apic.c
	kernel/rcuclassic.c
	kernel/sched.c
	kernel/time/tick-sched.c

Signed-off-by: Mike Travis <travis@sgi.com>
[ mingo@elte.hu: backmerged typo fix for io_apic.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 0 deletions

diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 9c309daf492b..251fc1cd5002 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -281,10 +281,12 @@
 /* specific - Analog Devices */
 #define AC97_AD_TEST            0x5a    /* test register */
 #define AC97_AD_TEST2           0x5c    /* undocumented test register 2 */
+#define AC97_AD_HPFD_SHIFT      12      /* High Pass Filter Disable */
 #define AC97_AD_CODEC_CFG       0x70    /* codec configuration */
 #define AC97_AD_JACK_SPDIF      0x72    /* Jack Sense & S/PDIF */
 #define AC97_AD_SERIAL_CFG      0x74    /* Serial Configuration */
 #define AC97_AD_MISC            0x76    /* Misc Control Bits */
+#define AC97_AD_VREFD_SHIFT     2       /* V_REFOUT Disable (AD1888) */
 
 /* specific - Cirrus Logic */
 #define AC97_CSR_ACMODE         0x5e    /* AC Mode Register */