rpms/kernel/F-10 linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch, NONE, 1.1 kernel.spec, 1.1316, 1.1317

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3992

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch 
Log Message:
* Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
- linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch (#493053)


linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch:

--- NEW FILE linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch ---
--- a/include/linux/dvb/audio.h
+++ b/include/linux/dvb/audio.h
@@ -76,7 +76,7 @@ struct audio_karaoke{  /* if Vocal1 or Vocal2 are non-zero, they get mixed  */
 } audio_karaoke_t;     /* into left and right  */
 
 
-typedef uint16_t audio_attributes_t;
+typedef __u16 audio_attributes_t;
 /*   bits: descr. */
 /*   15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */
 /*   12    multichannel extension */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1316
retrieving revision 1.1317
diff -u -r1.1316 -r1.1317
--- kernel.spec	6 Apr 2009 17:00:03 -0000	1.1316
+++ kernel.spec	7 Apr 2009 17:24:19 -0000	1.1317
@@ -664,6 +664,8 @@
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
+Patch2900: linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
+
 Patch2911: linux-2.6-ext4-flush-on-close.patch
 
 # relatime patches from 2.6.30
@@ -1241,6 +1243,9 @@
 ApplyPatch squashfs3.patch
 ApplyPatch squashfs-fixups.patch
 
+# s/uint16_t/__u16/ (#493053)
+ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
+
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
@@ -1823,6 +1828,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 07 2009 Kyle McMartin <kyle at redhat.com>
+- linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch (#493053)
+
 * Mon Apr 06 2009 Kyle McMartin <kyle at redhat.com>
 - add git-bluetooth.patch from F-11, bluetooth fixes from 2.6.30