Revert "Revert revision 9953."

funny useless revertwar on a good news bsd license.
happy git user :)

This reverts commit e718b6b9c19bfea40c0953eaee2f1cdc8679b463.

svn path=/dists/trunk/linux-2.6/; revision=9955

debian/changelog

@@ -23,6 +23,7 @@ linux-2.6 (2.6.24~rc5-1~experimental.1) UNRELEASED; urgency=low
   * Set USB_EHCI_TT_NEWSCHED fills USB 2.0 bandwith better. (closes: #454797)
   * postrm: Nuke initramfs sha1sum on linux-image package removal.
   * Unifiy BSD_PROCESS_ACCT settings across configs. (closes: #455892)
+  * Reenable DABUSB as firmware is BSD licensed.
 
   [ Bastian Blank ]
   * [amd64, i386]: Set kernel architecture to x86.
@@ -34,7 +35,7 @@ linux-2.6 (2.6.24~rc5-1~experimental.1) UNRELEASED; urgency=low
   [ dann frazier ]
   * [ia64]: Enable BLK_CPQ_DA
 
- -- maximilian attems <maks@debian.org>  Wed, 12 Dec 2007 15:06:07 +0100
+ -- maximilian attems <maks@debian.org>  Thu, 13 Dec 2007 13:50:38 +0100
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
 

debian/patches/bugfix/0001-USB-dabfirmware.h-add-missing-license.patch

@@ -0,0 +1,34 @@
+From 468bf6a10da185bc6d79c1670f7a418f1c5a3cd5 Mon Sep 17 00:00:00 2001
+From: maximilian attems <max@stro.at>
+Date: Thu, 13 Dec 2007 13:36:21 +0100
+Subject: [PATCH] [USB] dabfirmware.h add missing license
+
+Received written ack from the dabusb author
+that the firmware is BSD licensed.
+
+Signed-off-by: maximilian attems <max@stro.at>
+Acked-by: Deti Fliegl <deti@fliegl.de>
+---
+ drivers/media/video/dabfirmware.h |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/media/video/dabfirmware.h b/drivers/media/video/dabfirmware.h
+index d14d803..cbd9263 100644
+--- a/drivers/media/video/dabfirmware.h
++++ b/drivers/media/video/dabfirmware.h
+@@ -1,5 +1,12 @@
+ /*
+  * dabdata.h - dab usb firmware and bitstream data
++ *
++ * Copyright (C) 1999 BayCom GmbH
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that redistributions of source
++ * code retain the above copyright notice and this comment without
++ * modification.
+  */
+ 
+ static INTEL_HEX_RECORD firmware[] = {
+-- 
+debian.1.5.3.7.1-dirty
+

debian/patches/debian/dfsg/drivers-media-video-dabus.patch

@@ -1,25 +0,0 @@
-diff -ruN a/drivers/media/Kconfig b/drivers/media/Kconfig
---- a/drivers/media/Kconfig	2007-02-04 19:44:54.000000000 +0100
-+++ b/drivers/media/Kconfig	2007-02-05 16:24:30.000000000 +0100
-@@ -85,16 +85,0 @@
--if DAB
--config USB_DABUSB
--	tristate "DABUSB driver"
--	depends on USB
--	---help---
--	  A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
--	  brought to you by the DAB-Team
--	  <http://wwwbode.cs.tum.edu/Par/arch/dab/>.  This driver can be taken
--	  as an example for URB-based bulk, control, and isochronous
--	  transactions. URB's are explained in
--	  <Documentation/usb/URB.txt>.
--
--	  To compile this driver as a module, choose M here: the
--	  module will be called dabusb.
--endif # DAB
--
-diff -ruN a/drivers/media/video/Makefile b/drivers/media/video/Makefile
---- a/drivers/media/video/Makefile	2007-02-04 19:44:54.000000000 +0100
-+++ b/drivers/media/video/Makefile	2007-02-05 16:24:30.000000000 +0100
-@@ -94,1 +94,0 @@
--obj-$(CONFIG_USB_DABUSB)        += dabusb.o

debian/patches/debian/dfsg/files-1

@@ -13,10 +13,6 @@ rm drivers/char/ip2
 
 rm drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h
 
-rm drivers/media/video/dabfirmware.h
-rm drivers/media/video/dabusb.c
-rm drivers/media/video/dabusb.h
-
 rm drivers/net/acenic_firmware.h
 
 unifdef drivers/net/tg3.c -UREMOVE_DFSG

debian/patches/series/1~experimental.1

@@ -36,3 +36,5 @@
 + bugfix/arm/disable-chelsio_t3.patch
 + bugfix/arm/disable-video_bt848.patch
 + bugfix/arm/disable-scsi_acard.patch
+# 2.6.24-rc6 stuff
+#+ bugfix/0001-USB-dabfirmware.h-add-missing-license.patch