diff options
Diffstat (limited to 'debian/patches/debian/dfsg')
| -rw-r--r-- | debian/patches/debian/dfsg/files-1 | 2 | ||||
| -rw-r--r-- | debian/patches/debian/dfsg/firmware-cleanup.patch | 3 | ||||
| -rw-r--r-- | debian/patches/debian/dfsg/ip_qib-sd7220-disable.patch | 36 |
3 files changed, 2 insertions, 39 deletions
diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index af5613131..fb132269e 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -39,8 +39,6 @@ rm drivers/media/dvb/dvb-usb/af9005-script.h unifdef drivers/media/dvb/frontends/lgs8gxx.c -UREMOVE_DFSG -rm drivers/infiniband/hw/qib/qib_sd7220_img.c - rm drivers/net/appletalk/cops.c rm drivers/net/appletalk/cops.h rm drivers/net/appletalk/cops_ffdrv.h diff --git a/debian/patches/debian/dfsg/firmware-cleanup.patch b/debian/patches/debian/dfsg/firmware-cleanup.patch index 3e390fa3d..a435a1a28 100644 --- a/debian/patches/debian/dfsg/firmware-cleanup.patch +++ b/debian/patches/debian/dfsg/firmware-cleanup.patch @@ -56,7 +56,7 @@ index 1c00d05..3bf888d 100644 fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \ cis/DP83903.cis cis/NE2K.cis \ cis/tamarack.cis cis/PE-200.cis \ -@@ -77,66 +32,8 @@ fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \ +@@ -77,67 +32,8 @@ fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \ cis/COMpad2.cis cis/COMpad4.cis \ cis/SW_555_SER.cis cis/SW_7xx_SER.cis \ cis/SW_8xx_SER.cis @@ -66,6 +66,7 @@ index 1c00d05..3bf888d 100644 -fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \ - qlogic/12160.bin -fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin +-fw-shipped-$(CONFIG_INFINIBAND_QIB) += qlogic/sd7220.fw -fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin -fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp -fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \ diff --git a/debian/patches/debian/dfsg/ip_qib-sd7220-disable.patch b/debian/patches/debian/dfsg/ip_qib-sd7220-disable.patch deleted file mode 100644 index 06f4254f9..000000000 --- a/debian/patches/debian/dfsg/ip_qib-sd7220-disable.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Ben Hutchings <ben@decadent.org.uk> -Date: Mon, 17 Aug 2009 02:17:09 +0100 -Subject: [PATCH] ib_qib: disable use of SD7220 - ---- a/drivers/infiniband/hw/qib/Makefile -+++ b/drivers/infiniband/hw/qib/Makefile -@@ -6,7 +6,7 @@ ib_qib-y := qib_cq.o qib_diag.o qib_dma.o qib_driver.o qib_eeprom.o \ - qib_qp.o qib_qsfp.o qib_rc.o qib_ruc.o qib_sdma.o qib_srq.o \ - qib_sysfs.o qib_twsi.o qib_tx.o qib_uc.o qib_ud.o \ - qib_user_pages.o qib_user_sdma.o qib_verbs_mcast.o qib_iba7220.o \ -- qib_sd7220.o qib_sd7220_img.o qib_iba7322.o qib_verbs.o -+ qib_sd7220.o qib_iba7322.o qib_verbs.o - - # 6120 has no fallback if no MSI interrupts, others can do INTx - ib_qib-$(CONFIG_PCI_MSI) += qib_iba6120.o ---- a/drivers/infiniband/hw/qib/qib_sd7220.c -+++ b/drivers/infiniband/hw/qib/qib_sd7220.c -@@ -881,6 +902,18 @@ int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum, - return errors ? -errors : sofar; - } - -+int -+qib_sd7220_ib_load(struct qib_devdata *dd) -+{ -+ return -1; -+} -+ -+int -+qib_sd7220_ib_vfy(struct qib_devdata *dd) -+{ -+ return -1; -+} -+ - /* - * IRQ not set up at this point in init, so we poll. - */ |