Author: waldi
Date: Wed Sep 26 20:28:59 2007
New Revision: 9567
Log:
* debian/changelog: Update.
* debian/patches/debian/dfsg/files-1: Drop files from drivers/atm.
* debian/patches/debian/dfsg/drivers-atm.patch: Add.
* debian/patches/series/orig-0: Update.
Added:
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-atm.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
dists/trunk/linux-2.6/debian/patches/series/orig-0
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Wed Sep 26 20:28:59 2007
@@ -54,6 +54,9 @@
- MyriCOM Gigabit Ethernet support
- PTI Qlogic, ISP Driver
- Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x
+ - Madge Ambassador (Collage PCI 155 Server)
+ - PCA-200E support
+ - SBA-200E support
* Disable now broken drivers:
- Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support
- Broadcom Tigon3 support
@@ -63,6 +66,9 @@
- MyriCOM Gigabit Ethernet support
- PTI Qlogic, ISP Driver
- Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x
+ - Madge Ambassador (Collage PCI 155 Server)
+ - PCA-200E support
+ - SBA-200E support
* Add -common to common header package names.
* Drop provides from common header packages.
Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-atm.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-atm.patch Wed Sep
26 20:28:59 2007
@@ -0,0 +1,115 @@
+diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
+index b554eda..8f8de2e 100644
+--- a/drivers/atm/Kconfig
++++ b/drivers/atm/Kconfig
+@@ -247,2 +247,3 @@ config ATM_AMBASSADOR
+ tristate "Madge Ambassador (Collage PCI 155 Server)"
++ depends on BROKEN
+ depends on PCI && VIRT_TO_BUS
+@@ -345,2 +346,3 @@ config ATM_FORE200E_PCA
+ bool "PCA-200E support"
++ depends on BROKEN
+ depends on ATM_FORE200E_MAYBE && PCI
+@@ -349,26 +351,5 @@ config ATM_FORE200E_PCA
+
+-config ATM_FORE200E_PCA_DEFAULT_FW
+- bool "Use default PCA-200E firmware (normally enabled)"
+- depends on ATM_FORE200E_PCA
+- help
+- Use the default PCA-200E firmware data shipped with the driver.
+-
+- Normal users do not have to deal with the firmware stuff, so
+- they should say Y here.
+-
+-config ATM_FORE200E_PCA_FW
+- string "Pathname of user-supplied binary firmware"
+- depends on ATM_FORE200E_PCA && !ATM_FORE200E_PCA_DEFAULT_FW
+- default ""
+- help
+- This defines the pathname of an alternative PCA-200E binary
+- firmware image supplied by the user. This pathname may be
+- absolute or relative to the drivers/atm directory.
+-
+- The driver comes with an adequate firmware image, so normal users do
+- not have to supply an alternative one. They just say Y to "Use
+- default PCA-200E firmware" instead.
+-
+ config ATM_FORE200E_SBA
+ bool "SBA-200E support"
++ depends on BROKEN
+ depends on ATM_FORE200E_MAYBE && SBUS
+@@ -377,24 +358,2 @@ config ATM_FORE200E_SBA
+
+-config ATM_FORE200E_SBA_DEFAULT_FW
+- bool "Use default SBA-200E firmware (normally enabled)"
+- depends on ATM_FORE200E_SBA
+- help
+- Use the default SBA-200E firmware data shipped with the driver.
+-
+- Normal users do not have to deal with the firmware stuff, so
+- they should say Y here.
+-
+-config ATM_FORE200E_SBA_FW
+- string "Pathname of user-supplied binary firmware"
+- depends on ATM_FORE200E_SBA && !ATM_FORE200E_SBA_DEFAULT_FW
+- default ""
+- help
+- This defines the pathname of an alternative SBA-200E binary
+- firmware image supplied by the user. This pathname may be
+- absolute or relative to the drivers/atm directory.
+-
+- The driver comes with an adequate firmware image, so normal users do
+- not have to supply an alternative one. They just say Y to "Use
+- default SBA-200E firmware", above.
+-
+ config ATM_FORE200E_USE_TASKLET
+diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile
+index 1b16f81..3b2fd66 100644
+--- a/drivers/atm/Makefile
++++ b/drivers/atm/Makefile
+@@ -5,10 +5,2 @@
+ fore_200e-objs := fore200e.o
+-hostprogs-y := fore200e_mkfirm
+-
+-# Files generated that shall be removed upon make clean
+-clean-files := atmsar11.bin atmsar11.bin1 atmsar11.bin2 pca200e.bin \
+- pca200e.bin1 pca200e.bin2 pca200e_ecd.bin pca200e_ecd.bin1 \
+- pca200e_ecd.bin2 sba200e_ecd.bin sba200e_ecd.bin1 sba200e_ecd.bin2
+-# Firmware generated that shall be removed upon make clean
+-clean-files += fore200e_pca_fw.c fore200e_sba_fw.c
+
+@@ -38,17 +30,2 @@ obj-$(CONFIG_ATM_LANAI) += lanai.o
+
+-ifeq ($(CONFIG_ATM_FORE200E_PCA),y)
+- fore_200e-objs += fore200e_pca_fw.o
+- # guess the target endianess to choose the right PCA-200E firmware image
+- ifeq ($(CONFIG_ATM_FORE200E_PCA_DEFAULT_FW),y)
+- byteorder.h := include$(if $(patsubst
$(srctree),,$(objtree)),2)/asm/byteorder.h
+- CONFIG_ATM_FORE200E_PCA_FW := $(obj)/pca200e$(if $(shell $(CC)
$(CPPFLAGS) -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2)
+- endif
+-endif
+-
+-ifeq ($(CONFIG_ATM_FORE200E_SBA),y)
+- fore_200e-objs += fore200e_sba_fw.o
+- ifeq ($(CONFIG_ATM_FORE200E_SBA_DEFAULT_FW),y)
+- CONFIG_ATM_FORE200E_SBA_FW := $(obj)/sba200e_ecd.bin2
+- endif
+-endif
+ obj-$(CONFIG_ATM_HE) += he.o
+@@ -58,16 +35 @@ endif
+
+-# FORE Systems 200E-series firmware magic
+-$(obj)/fore200e_pca_fw.c: $(patsubst "%", %, $(CONFIG_ATM_FORE200E_PCA_FW)) \
+- $(obj)/fore200e_mkfirm
+- $(obj)/fore200e_mkfirm -k -b _fore200e_pca_fw \
+- -i $(CONFIG_ATM_FORE200E_PCA_FW) -o $@
+-
+-$(obj)/fore200e_sba_fw.c: $(patsubst "%", %, $(CONFIG_ATM_FORE200E_SBA_FW)) \
+- $(obj)/fore200e_mkfirm
+- $(obj)/fore200e_mkfirm -k -b _fore200e_sba_fw \
+- -i $(CONFIG_ATM_FORE200E_SBA_FW) -o $@
+-
+-# deal with the various suffixes of the binary firmware images
+-$(obj)/%.bin $(obj)/%.bin1 $(obj)/%.bin2: $(src)/%.data
+- objcopy -Iihex $< -Obinary [EMAIL PROTECTED]
+- gzip -n -df [EMAIL PROTECTED]
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 (original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Wed Sep 26
20:28:59 2007
@@ -1,5 +1,14 @@
rm Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
+rm drivers/atm/atmsar11.data
+rm drivers/atm/atmsar11.regions
+rm drivers/atm/atmsar11.start
+rm drivers/atm/fore200e_firmware_copyright
+rm drivers/atm/fore200e_mkfirm.c
+rm drivers/atm/pca200e.data
+rm drivers/atm/pca200e_ecd.data
+rm drivers/atm/sba200e_ecd.data
+
rm drivers/char/ip2
rm drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h
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 Wed Sep 26 20:28:59 2007
@@ -1,3 +1,4 @@
++ 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.patch
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
