[kernel] r11978 - in dists/sid/linux-2.6/debian/patches: bugfix/all/stable series

[Bastian Blank]

Author: waldi
Date: Thu Aug  7 12:22:15 2008
New Revision: 11978

Log:
Workaround ABI breakage in the emu10k1 module.

* debian/patches/bugfix/all/stable/2.6.26.2-abi-1.patch: Add.
* debian/patches/series/2: Add new patch.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.26.2-abi-1.patch
Modified:
   dists/sid/linux-2.6/debian/patches/series/2

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.26.2-abi-1.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.26.2-abi-1.patch	Thu Aug  7 12:22:15 2008
@@ -0,0 +1,21 @@
+All snd_emu_chip_details instances are statically allocated and all users of
+this new member are within one module.
+
+diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
+index 10ee28e..1515459 100644
+--- a/include/sound/emu10k1.h
++++ b/include/sound/emu10k1.h
+@@ -1670,10 +1670,12 @@ struct snd_emu_chip_details {
+ 	unsigned char spi_dac;      /* SPI interface for DAC */
+ 	unsigned char i2c_adc;      /* I2C interface for ADC */
+ 	unsigned char adc_1361t;    /* Use Philips 1361T ADC */
+-	unsigned char invert_shared_spdif; /* analog/digital switch inverted */
+ 	const char *driver;
+ 	const char *name;
+ 	const char *id;		/* for backward compatibility - can be NULL if not needed */
++#ifndef __GENKSYMS__
++	unsigned char invert_shared_spdif; /* analog/digital switch inverted */
++#endif
+ };
+ 
+ struct snd_emu1010 {

Modified: dists/sid/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2	(original)
+++ dists/sid/linux-2.6/debian/patches/series/2	Thu Aug  7 12:22:15 2008
@@ -4,3 +4,4 @@
 + features/arm/ts409-export-reset.patch
 + features/x86/drivers-hp_ilo-fixup.patch
 + bugfix/all/stable/2.6.26.2.patch
++ bugfix/all/stable/2.6.26.2-abi-1.patch