remove hid-wiimote patch, it was wrong for 3.1 and 3.0

diff --git a/queue-3.0/hid-wiimote-select-input_ff_memless.patch b/queue-3.0/hid-wiimote-select-input_ff_memless.patch
deleted file mode 100644 (file)
index 972692f..0000000
--- a/queue-3.0/hid-wiimote-select-input_ff_memless.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ef6f41157f3864d9bf42671b2ed66062dcafb72e Mon Sep 17 00:00:00 2001
-From: David Herrmann <dh.herrmann@googlemail.com>
-Date: Wed, 7 Dec 2011 21:33:59 +0100
-Subject: HID: wiimote: Select INPUT_FF_MEMLESS
-
-From: David Herrmann <dh.herrmann@googlemail.com>
-
-commit ef6f41157f3864d9bf42671b2ed66062dcafb72e upstream.
-
-We depend on memless force-feedback support, therefore correctly select the
-related config options.
-
-Reported-by: Randy Dunlap <rdunlap@xenotime.net>
-Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/hid/Kconfig |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/hid/Kconfig
-+++ b/drivers/hid/Kconfig
-@@ -565,6 +565,7 @@ config HID_WACOM_POWER_SUPPLY
-       bool "Wacom Bluetooth devices power supply status support"
-       depends on HID_WACOM
-       select POWER_SUPPLY
-+      select INPUT_FF_MEMLESS
-       ---help---
-         Say Y here if you want to enable power supply status monitoring for
-         Wacom Bluetooth devices.

diff --git a/queue-3.0/series b/queue-3.0/series
index 2d65bfa10317cc228689a82af1e2365f125a81ce..8f09a1bc3c01a9f9dfa4e002d8f764009749bef3 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -14,7 +14,6 @@ nfs-retry-mounting-nfsroot.patch
 nfsv4.1-fix-backchannel-slotid-off-by-one-bug.patch
 nfs-fix-regression-in-handling-of-context-option-in-nfsv4.patch
 hid-bump-maximum-global-item-tag-report-size-to-96-bytes.patch
-hid-wiimote-select-input_ff_memless.patch
 ubi-fix-missing-scrub-when-there-is-a-bit-flip.patch
 ubi-fix-use-after-free-on-error-path.patch
 pci-fix-pci_exp_type_rc_ec-value.patch

diff --git a/review-3.1/hid-wiimote-select-input_ff_memless.patch b/review-3.1/hid-wiimote-select-input_ff_memless.patch
deleted file mode 100644 (file)
index 7694050..0000000
--- a/review-3.1/hid-wiimote-select-input_ff_memless.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ef6f41157f3864d9bf42671b2ed66062dcafb72e Mon Sep 17 00:00:00 2001
-From: David Herrmann <dh.herrmann@googlemail.com>
-Date: Wed, 7 Dec 2011 21:33:59 +0100
-Subject: HID: wiimote: Select INPUT_FF_MEMLESS
-
-From: David Herrmann <dh.herrmann@googlemail.com>
-
-commit ef6f41157f3864d9bf42671b2ed66062dcafb72e upstream.
-
-We depend on memless force-feedback support, therefore correctly select the
-related config options.
-
-Reported-by: Randy Dunlap <rdunlap@xenotime.net>
-Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/hid/Kconfig |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/hid/Kconfig
-+++ b/drivers/hid/Kconfig
-@@ -583,6 +583,7 @@ config HID_WACOM_POWER_SUPPLY
-       bool "Wacom Bluetooth devices power supply status support"
-       depends on HID_WACOM
-       select POWER_SUPPLY
-+      select INPUT_FF_MEMLESS
-       ---help---
-         Say Y here if you want to enable power supply status monitoring for
-         Wacom Bluetooth devices.

diff --git a/review-3.1/series b/review-3.1/series
index a4c459c75e73d62e1d9a32d9cf9aa9c419ea1a55..138afe941bd9a3080871807dcf5a20d4a771e484 100644 (file)
--- a/review-3.1/series
+++ b/review-3.1/series
@@ -26,7 +26,6 @@ nfs-fix-recent-breakage-to-nfs-error-handling.patch
 nfsv4-include-bitmap-in-nfsv4-get-acl-data.patch
 nfs-fix-regression-in-handling-of-context-option-in-nfsv4.patch
 hid-bump-maximum-global-item-tag-report-size-to-96-bytes.patch
-hid-wiimote-select-input_ff_memless.patch
 ubi-fix-missing-scrub-when-there-is-a-bit-flip.patch
 ubi-fix-use-after-free-on-error-path.patch
 pci-fix-pci_exp_type_rc_ec-value.patch