[kernel] r11164 - in dists/trunk/linux-2.6/debian/patches: debian/dfsg series

[Maximilian Attems]

Author: maks
Date: Fri Apr 25 11:20:24 2008
New Revision: 11164

Log:
Revert "latest git sync, dabusb firmware license merge"

as license hast to be in *orig*,
can be redone after 2.6.26-rc1 then it no longer matters.

This reverts commit 9fa72143f21a220d8963ed518a52990ea4d3fe76.


Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus-license.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/orig-0

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus-license.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus-license.patch	Fri Apr 25 11:20:24 2008
@@ -0,0 +1,34 @@
+From 468bf6a10da185bc6d79c1670f7a418f1c5a3cd5 Mon Sep 17 00:00:00 2001
+From: maximilian attems <max at 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 at stro.at>
+Acked-by: Deti Fliegl <deti at 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
+

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Fri Apr 25 11:20:24 2008
@@ -3,6 +3,7 @@
 + debian/dfsg/drivers-atm.patch
 + debian/dfsg/drivers-char-computone.patch
 + debian/dfsg/drivers-media-dvb-ttusb-budget.patch
++ debian/dfsg/drivers-media-video-dabus-license.patch
 + debian/dfsg/drivers-net-acenic-remove.patch
 + debian/dfsg/drivers-net-bnx2-disable.patch
 + debian/dfsg/drivers-net-bnx2x-disable.patch