From: Greg Kroah-Hartman Date: Mon, 2 Dec 2013 21:32:58 +0000 (-0800) Subject: remove 2 3.12 patches that aren't needed X-Git-Tag: v3.4.72~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7084aa5f13ab05771200fbe20032eb624e64ba2f;p=thirdparty%2Fkernel%2Fstable-queue.git remove 2 3.12 patches that aren't needed --- diff --git a/queue-3.12/ahci-add-support-for-ibm-akebono-platform-device.patch b/queue-3.12/ahci-add-support-for-ibm-akebono-platform-device.patch deleted file mode 100644 index 85a957ed7a7..00000000000 --- a/queue-3.12/ahci-add-support-for-ibm-akebono-platform-device.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2435dcb98cfe13c246aa27df393e22bc24bbcd20 Mon Sep 17 00:00:00 2001 -From: Alistair Popple -Date: Fri, 22 Nov 2013 13:08:29 +1100 -Subject: ahci: add support for IBM Akebono platform device - -From: Alistair Popple - -commit 2435dcb98cfe13c246aa27df393e22bc24bbcd20 upstream. - -The new IBM Akebono board has a PPC476GTR SoC with an AHCI compliant -SATA controller. This patch adds a compatible property for the new SoC -to the AHCI platform driver. - -Signed-off-by: Alistair Popple -Signed-off-by: Tejun Heo -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/ata/ahci_platform.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/ata/ahci_platform.c -+++ b/drivers/ata/ahci_platform.c -@@ -328,6 +328,7 @@ static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ah - static const struct of_device_id ahci_of_match[] = { - { .compatible = "snps,spear-ahci", }, - { .compatible = "snps,exynos5440-ahci", }, -+ { .compatible = "ibm,476gtr-ahci", }, - {}, - }; - MODULE_DEVICE_TABLE(of, ahci_of_match); diff --git a/queue-3.12/hid-hid-lg4ff-initialize-device-properties-before-we-touch-autocentering.patch b/queue-3.12/hid-hid-lg4ff-initialize-device-properties-before-we-touch-autocentering.patch deleted file mode 100644 index 81f473f55e7..00000000000 --- a/queue-3.12/hid-hid-lg4ff-initialize-device-properties-before-we-touch-autocentering.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 114a55cf9dd1576e7ac56189832cd4d7dc56c218 Mon Sep 17 00:00:00 2001 -From: Simon Wood -Date: Wed, 6 Nov 2013 12:30:43 -0700 -Subject: HID:hid-lg4ff: Initialize device properties before we touch autocentering. - -From: Simon Wood - -commit 114a55cf9dd1576e7ac56189832cd4d7dc56c218 upstream. - -Re-arrange code slightly to ensure that device properties are configured -before calling auto-center command. - -Reported-by: Michal Malý -Signed-off-by: Simon Wood -Signed-off-by: Jiri Kosina -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hid/hid-lg4ff.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - ---- a/drivers/hid/hid-lg4ff.c -+++ b/drivers/hid/hid-lg4ff.c -@@ -574,17 +574,6 @@ int lg4ff_init(struct hid_device *hid) - if (error) - return error; - -- /* Check if autocentering is available and -- * set the centering force to zero by default */ -- if (test_bit(FF_AUTOCENTER, dev->ffbit)) { -- if (rev_maj == FFEX_REV_MAJ && rev_min == FFEX_REV_MIN) /* Formula Force EX expects different autocentering command */ -- dev->ff->set_autocenter = hid_lg4ff_set_autocenter_ffex; -- else -- dev->ff->set_autocenter = hid_lg4ff_set_autocenter_default; -- -- dev->ff->set_autocenter(dev, 0); -- } -- - /* Get private driver data */ - drv_data = hid_get_drvdata(hid); - if (!drv_data) { -@@ -605,6 +594,17 @@ int lg4ff_init(struct hid_device *hid) - entry->max_range = lg4ff_devices[i].max_range; - entry->set_range = lg4ff_devices[i].set_range; - -+ /* Check if autocentering is available and -+ * set the centering force to zero by default */ -+ if (test_bit(FF_AUTOCENTER, dev->ffbit)) { -+ if (rev_maj == FFEX_REV_MAJ && rev_min == FFEX_REV_MIN) /* Formula Force EX expects different autocentering command */ -+ dev->ff->set_autocenter = hid_lg4ff_set_autocenter_ffex; -+ else -+ dev->ff->set_autocenter = hid_lg4ff_set_autocenter_default; -+ -+ dev->ff->set_autocenter(dev, 0); -+ } -+ - /* Create sysfs interface */ - error = device_create_file(&hid->dev, &dev_attr_range); - if (error) diff --git a/queue-3.12/series b/queue-3.12/series index 9f7f0c715e0..5e152513cff 100644 --- a/queue-3.12/series +++ b/queue-3.12/series @@ -53,7 +53,6 @@ ipc-msg-fix-message-length-check-for-negative-values.patch ahci-add-device-ids-for-intel-wildcat-point-lp.patch ahci-disabled-fbs-prior-to-issuing-software-reset.patch ahci-add-marvell-9230-to-the-ahci-pci-device-list.patch -ahci-add-support-for-ibm-akebono-platform-device.patch iscsi-target-fix-mutex_trylock-usage-in-iscsit_increment_maxcmdsn.patch iscsi-target-fix-extract_param-to-handle-buffer-length-corner-case.patch iscsi-target-chap-auth-shouldn-t-match-username-with-trailing-garbage.patch @@ -180,7 +179,6 @@ hid-hid-sensor-hub-fix-report-size.patch hid-multicouh-add-pid-vid-to-support-1-new-wistron-optical-touch-device.patch hid-hid-lg4ff-scale-autocentering-force-properly-on-logitech-wheel.patch hid-hid-lg4ff-switch-autocentering-off-when-strength-is-set-to-zero.patch -hid-hid-lg4ff-initialize-device-properties-before-we-touch-autocentering.patch hid-lg-fix-reportdescriptor-for-logitech-formula-vibration.patch gpio-pl061-move-irqdomain-initialization.patch drm-radeon-vm-don-t-attempt-to-update-ptes-if-ib-allocation-fails.patch