summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorTobias Powalowski <tobias@T-POWA-LX.(none)>2009-09-09 13:53:47 +0200
committerTobias Powalowski <tobias@T-POWA-LX.(none)>2009-09-09 13:53:47 +0200
commitd8fc706498d6bca19676a45b85742f7872e79444 (patch)
tree47d2b05b1123d73fb0f71e166a7a401dd8029bfb /patches
parenta1259b7fc360d9394aff762a508a7730d956d45c (diff)
update to latest stable kernel, removed unneeded patches
Diffstat (limited to 'patches')
-rw-r--r--patches/elgatedvb.patch61
-rw-r--r--patches/kms-2.6.30-2.patch54
-rw-r--r--patches/kms-2.6.30.patch35
-rw-r--r--patches/quirks-h12y.patch86
-rw-r--r--patches/rt2870.patch11
-rw-r--r--patches/wmi.patch33
6 files changed, 0 insertions, 280 deletions
diff --git a/patches/elgatedvb.patch b/patches/elgatedvb.patch
deleted file mode 100644
index 48f49b9..0000000
--- a/patches/elgatedvb.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -r 9cb19f080660 linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
---- a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Tue Feb 10 05:26:05 2009 -0200
-+++ b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Tue Feb 10 21:47:53 2009 +0100
-@@ -1419,6 +1419,7 @@
- { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000H) },
- /* 40 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E) },
- { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E_SE) },
-+ { USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_DTT) },
- { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_EXPRESS) },
- { USB_DEVICE(USB_VID_TERRATEC,
- USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2) },
-@@ -1618,7 +1619,7 @@
- },
- },
-
-- .num_device_descs = 9,
-+ .num_device_descs = 10,
- .devices = {
- { "DiBcom STK7070P reference design",
- { &dib0700_usb_id_table[15], NULL },
-@@ -1654,6 +1655,10 @@
- },
- { "Terratec Cinergy T USB XXS",
- { &dib0700_usb_id_table[33], NULL },
-+ { NULL },
-+ },
-+ { "Elgato EyeTV DTT",
-+ { &dib0700_usb_id_table[42], NULL },
- { NULL },
- },
- },
-diff -r 9cb19f080660 linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
---- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h Tue Feb 10 05:26:05 2009 -0200
-+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h Tue Feb 10 21:47:53 2009 +0100
-@@ -27,6 +27,7 @@
- #define USB_VID_DIBCOM 0x10b8
- #define USB_VID_DPOSH 0x1498
- #define USB_VID_DVICO 0x0fe9
-+#define USB_VID_ELGATO 0x0fd9
- #define USB_VID_EMPIA 0xeb1a
- #define USB_VID_GENPIX 0x09c0
- #define USB_VID_GRANDTEC 0x5032
-@@ -237,5 +238,6 @@
- #define USB_PID_XTENSIONS_XD_380 0x0381
- #define USB_PID_TELESTAR_STARSTICK_2 0x8000
- #define USB_PID_MSI_DIGI_VOX_MINI_III 0x8807
-+#define USB_PID_ELGATO_EYETV_DTT 0x0021
-
- #endif
-diff -r 9cb19f080660 linux/drivers/media/dvb/dvb-usb/dvb-usb.h
---- a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h Tue Feb 10 05:26:05 2009 -0200
-+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h Tue Feb 10 21:47:53 2009 +0100
-@@ -224,7 +224,7 @@
- int generic_bulk_ctrl_endpoint;
-
- int num_device_descs;
-- struct dvb_usb_device_description devices[9];
-+ struct dvb_usb_device_description devices[10];
- };
-
- /**
diff --git a/patches/kms-2.6.30-2.patch b/patches/kms-2.6.30-2.patch
deleted file mode 100644
index 2866c4e..0000000
--- a/patches/kms-2.6.30-2.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Ma Ling <ling.ma@intel.com>
-Date: Sun, 31 May 2009 08:58:32 +0000 (+0800)
-Subject: drm/i915: Set correct TV detection voltage level override values
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fanholt%2Fdrm-intel.git;a=commitdiff_plain;h=cb66c692d1ae257f32dc7f6085cf9cb9f2f6bab8
-
-drm/i915: Set correct TV detection voltage level override values
-
-We detect TV connect status by setting DAC voltage level override
-values as 0.7 voltage for DAC_A/B/C. The corresponding 2-bits shold be 0x2,
-In order correctly to set last bit as 0, at first we must clean it.
-
-It fixed freedesktop.org bug #21204
-
-Signed-off-by: Ma Ling <ling.ma@intel.com>
-Signed-off-by: Eric Anholt <eric@anholt.net>
----
-
-diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index 99681cf..79df9e9 100644
---- a/drivers/gpu/drm/i915/i915_reg.h
-+++ b/drivers/gpu/drm/i915/i915_reg.h
-@@ -958,15 +958,15 @@
- # define DAC_A_1_3_V (0 << 4)
- # define DAC_A_1_1_V (1 << 4)
- # define DAC_A_0_7_V (2 << 4)
--# define DAC_A_OFF (3 << 4)
-+# define DAC_A_MASK (3 << 4)
- # define DAC_B_1_3_V (0 << 2)
- # define DAC_B_1_1_V (1 << 2)
- # define DAC_B_0_7_V (2 << 2)
--# define DAC_B_OFF (3 << 2)
-+# define DAC_B_MASK (3 << 2)
- # define DAC_C_1_3_V (0 << 0)
- # define DAC_C_1_1_V (1 << 0)
- # define DAC_C_0_7_V (2 << 0)
--# define DAC_C_OFF (3 << 0)
-+# define DAC_C_MASK (3 << 0)
-
- /**
- * CSC coefficients are stored in a floating point format with 9 bits of
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index d2c3298..c7d9ef0 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1392,6 +1392,9 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_output *intel_output)
- tv_ctl &= ~TV_TEST_MODE_MASK;
- tv_ctl |= TV_TEST_MODE_MONITOR_DETECT;
- tv_dac &= ~TVDAC_SENSE_MASK;
-+ tv_dac &= ~DAC_A_MASK;
-+ tv_dac &= ~DAC_B_MASK;
-+ tv_dac &= ~DAC_C_MASK;
- tv_dac |= (TVDAC_STATE_CHG_EN |
- TVDAC_A_SENSE_CTL |
- TVDAC_B_SENSE_CTL |
diff --git a/patches/kms-2.6.30.patch b/patches/kms-2.6.30.patch
deleted file mode 100644
index 168a78c..0000000
--- a/patches/kms-2.6.30.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Keith Packard <keithp@keithp.com>
-Date: Sat, 6 Jun 2009 01:19:56 +0000 (-0700)
-Subject: drm/i915: Hook connector to encoder during load detection (fixes tv/vga detect)
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fanholt%2Fdrm-intel.git;a=commitdiff_plain;h=03d6069912babc07a3da20e715dd6a5dc8f0f867
-
-drm/i915: Hook connector to encoder during load detection (fixes tv/vga detect)
-
-With the DRM-driven DPMS code, encoders are considered idle unless a
-connector is hooked to them, so mode setting is skipped. This makes load
-detection fail as none of the hardware is enabled.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
-Signed-off-by: Eric Anholt <eric@anholt.net>
----
-
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index a87eeff..b32a51f 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -2136,6 +2136,7 @@ struct drm_crtc *intel_get_load_detect_pipe(struct intel_output *intel_output,
- }
-
- encoder->crtc = crtc;
-+ intel_output->base.encoder = encoder;
- intel_output->load_detect_temp = true;
-
- intel_crtc = to_intel_crtc(crtc);
-@@ -2171,6 +2172,7 @@ void intel_release_load_detect_pipe(struct intel_output *intel_output, int dpms_
-
- if (intel_output->load_detect_temp) {
- encoder->crtc = NULL;
-+ intel_output->base.encoder = NULL;
- intel_output->load_detect_temp = false;
- crtc->enabled = drm_helper_crtc_in_use(crtc);
- drm_helper_disable_unused_functions(dev);
diff --git a/patches/quirks-h12y.patch b/patches/quirks-h12y.patch
deleted file mode 100644
index 99f5fa0..0000000
--- a/patches/quirks-h12y.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- linux/drivers/pci/quirks.c 2008-09-08 20:33:16.000000000 +0200
-+++ linux/drivers/pci/quirks.c 2008-10-06 16:37:35.000000000 +0200
-@@ -1381,6 +1381,82 @@
- PCI_DEVICE_ID_TOSHIBA_TC86C001_IDE,
- quirk_tc86c001_ide);
-
-+/*
-+ * The Twinhad H12Y assign mmio (0xffbfe800-0xffbfecff)
-+ * resources that seems to be used by an unknown device.
-+ * This quirk reserve more than really used mmio space to
-+ * force change the mmio area of the cardreader and the network chip.
-+ * See http://bugzilla.kernel.org/show_bug.cgi?id=10231
-+ * and http://bugzilla.kernel.org/show_bug.cgi?id=9905
-+ * for more details
-+ */
-+static void __init quirk_h12y_1_mmio(struct pci_dev *dev)
-+{
-+/*
-+ * Network Device: Realtek 8139C of Twinhead H12Y
-+ * PCI VENDOR: 0x10EC PCI ID:0x8139
-+ * SUB VENDOR: 0x14FF SUB ID:0xA003
-+ */
-+ struct resource *r = &dev->resource[1];
-+ if ((dev->subsystem_vendor) == 0x14FF &&
-+ (dev->subsystem_device) == 0xA003) {
-+ r->start = 0;
-+ r->end = 0x03ff;
-+ }
-+}
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_REALTEK,
-+ PCI_DEVICE_ID_REALTEK_8139,
-+ quirk_h12y_1_mmio);
-+
-+static void __init quirk_h12y_2_mmio(struct pci_dev *dev)
-+{
-+/*
-+ * SD-Cardreader Device: O2 7120 of Twinhead H12Y
-+ * PCI VENDOR: 0x1217 PCI ID:0x7120
-+ * SUB VENDOR: 0x14FF SUB ID:0xA003
-+ */
-+ struct resource *r = &dev->resource[0];
-+ if ((dev->subsystem_vendor) == 0x14FF &&
-+ (dev->subsystem_device) == 0xA003) {
-+ r->start = 0;
-+ r->end = 0x03ff;
-+ }
-+}
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x7120,quirk_h12y_2_mmio);
-+
-+static void __init quirk_h12y_3_mmio(struct pci_dev *dev)
-+{
-+/*
-+ * Firewire Device: O2 00F7 of Twinhead H12Y
-+ * PCI VENDOR: 0x1217 PCI ID:0x00F7
-+ * SUB VENDOR: 0x14FF SUB ID:0xA003
-+ */
-+ struct resource *r = &dev->resource[1];
-+ if ((dev->subsystem_vendor) == 0x14FF &&
-+ (dev->subsystem_device) == 0xA003) {
-+ r->start = 0;
-+ r->end = 0x0fff;
-+ }
-+}
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x00F7,quirk_h12y_3_mmio);
-+
-+static void __init quirk_h12y_4_mmio(struct pci_dev *dev)
-+{
-+/*
-+ * MS-Cardreader Device: O2 7130 of Twinhead H12Y
-+ * PCI VENDOR: 0x1217 PCI ID:0x7130
-+ * SUB VENDOR: 0x14FF SUB ID:0xA003
-+ */
-+ struct resource *r = &dev->resource[0];
-+ if ((dev->subsystem_vendor) == 0x14FF &&
-+ (dev->subsystem_device) == 0xA003) {
-+ r->start = 0;
-+ r->end = 0x1fff;
-+ }
-+}
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x7130,quirk_h12y_4_mmio);
-+
-+
- static void __devinit quirk_netmos(struct pci_dev *dev)
- {
- unsigned int num_parallel = (dev->subsystem_device & 0xf0) >> 4;
-
diff --git a/patches/rt2870.patch b/patches/rt2870.patch
deleted file mode 100644
index 0dda620..0000000
--- a/patches/rt2870.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- old/src/linux-2.6.29/drivers/staging/rt2870/rt2870.h 2009-03-24 00:12:14.000000000 +0100
-+++ new/src/linux-2.6.29/drivers/staging/rt2870/rt2870.h 2009-03-27 21:18:12.000000000 +0100
-@@ -104,6 +104,7 @@
- {USB_DEVICE(0x14B2,0x3C07)}, /* AL */ \
- {USB_DEVICE(0x14B2,0x3C12)}, /* AL */ \
- {USB_DEVICE(0x050D,0x8053)}, /* Belkin */ \
-+ {USB_DEVICE(0x050D,0x815C)}, /* Belkin */ \
- {USB_DEVICE(0x14B2,0x3C23)}, /* Airlink */ \
- {USB_DEVICE(0x14B2,0x3C27)}, /* Airlink */ \
- {USB_DEVICE(0x07AA,0x002F)}, /* Corega */ \
-
diff --git a/patches/wmi.patch b/patches/wmi.patch
deleted file mode 100644
index a8b98da..0000000
--- a/patches/wmi.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
-index 043b208..f215a59 100644
---- a/drivers/platform/x86/wmi.c
-+++ b/drivers/platform/x86/wmi.c
-@@ -270,7 +270,7 @@ u32 method_id, const struct acpi_buffer *in, struct acpi_buffer *out)
- acpi_status status;
- struct acpi_object_list input;
- union acpi_object params[3];
-- char method[4] = "WM";
-+ char method[5] = "WM";
-
- if (!find_guid(guid_string, &wblock))
- return AE_ERROR;
-@@ -328,8 +328,8 @@ struct acpi_buffer *out)
- acpi_status status, wc_status = AE_ERROR;
- struct acpi_object_list input, wc_input;
- union acpi_object wc_params[1], wq_params[1];
-- char method[4];
-- char wc_method[4] = "WC";
-+ char method[5];
-+ char wc_method[5] = "WC";
-
- if (!guid_string || !out)
- return AE_BAD_PARAMETER;
-@@ -410,7 +410,7 @@ const struct acpi_buffer *in)
- acpi_handle handle;
- struct acpi_object_list input;
- union acpi_object params[2];
-- char method[4] = "WS";
-+ char method[5] = "WS";
-
- if (!guid_string || !in)
- return AE_BAD_DATA;