From: Henrique de Moraes Holschuh Date: Sat, 22 Mar 2008 00:26:24 +0000 (-0300) Subject: Add a patch accepted in 2.6.24-rc1 that was forgotten X-Git-Url: https://repo.or.cz/w/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git/commitdiff_plain/5683b84dd0eb506613c38548daa718289b080419 Add a patch accepted in 2.6.24-rc1 that was forgotten Signed-off-by: Henrique de Moraes Holschuh --- diff --git a/releases/upstream/2.6.24-rc1/0001-sony-laptop-thinkpad-acpi-fix-INPUT-n-build.patch b/releases/upstream/2.6.24-rc1/0001-sony-laptop-thinkpad-acpi-fix-INPUT-n-build.patch new file mode 100644 index 00000000000..54c87510d5c --- /dev/null +++ b/releases/upstream/2.6.24-rc1/0001-sony-laptop-thinkpad-acpi-fix-INPUT-n-build.patch @@ -0,0 +1,48 @@ +From 8a66074c379cacc79168681bf7dea37ad278f5d1 Mon Sep 17 00:00:00 2001 +From: Andreas Herrmann +Date: Mon, 17 Sep 2007 22:54:34 +0200 +Subject: [PATCH] sony-laptop/thinkpad-acpi: fix INPUT=n build + +Build errors if CONFIG_SONY_LAPTOP && !INPUT or +if CONFIG_THINKPAD_ACPI && !INPUT: + + LD vmlinux + ... +drivers/built-in.o: In function `sony_laptop_remove_input': +sony-laptop.c:(.text+0x768fb): undefined reference to `input_unregister_device' + ... +drivers/built-in.o: In function `thinkpad_acpi_module_exit': +thinkpad_acpi.c:(.text+0x78c1b): undefined reference to `input_free_device' + ... + +Signed-off-by: Andreas Herrmann +Acked-by: Henrique de Moraes Holschuh +Acked-by: Mattia Dongili +Signed-off-by: Len Brown +--- + drivers/misc/Kconfig | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig +index 73e248f..7b580c3 100644 +--- a/drivers/misc/Kconfig ++++ b/drivers/misc/Kconfig +@@ -134,6 +134,7 @@ config SONY_LAPTOP + tristate "Sony Laptop Extras" + depends on X86 && ACPI + select BACKLIGHT_CLASS_DEVICE ++ depends on INPUT + ---help--- + This mini-driver drives the SNC and SPIC devices present in the ACPI + BIOS of the Sony Vaio laptops. +@@ -156,6 +157,7 @@ config THINKPAD_ACPI + select BACKLIGHT_CLASS_DEVICE + select HWMON + select NVRAM ++ depends on INPUT + ---help--- + This is a driver for the IBM and Lenovo ThinkPad laptops. It adds + support for Fn-Fx key combinations, Bluetooth control, video +-- +1.5.4.4 + diff --git a/releases/upstream/2.6.24-rc1/0001-drivers-firmware-const-ify-DMI-API-and-internals.patch b/releases/upstream/2.6.24-rc1/0002-drivers-firmware-const-ify-DMI-API-and-internals.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0001-drivers-firmware-const-ify-DMI-API-and-internals.patch rename to releases/upstream/2.6.24-rc1/0002-drivers-firmware-const-ify-DMI-API-and-internals.patch diff --git a/releases/upstream/2.6.24-rc1/0002-hwmon-Convert-from-class_device-to-device.patch b/releases/upstream/2.6.24-rc1/0003-hwmon-Convert-from-class_device-to-device.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0002-hwmon-Convert-from-class_device-to-device.patch rename to releases/upstream/2.6.24-rc1/0003-hwmon-Convert-from-class_device-to-device.patch diff --git a/releases/upstream/2.6.24-rc1/0003-Map-volume-and-brightness-events-on-thinkpads.patch b/releases/upstream/2.6.24-rc1/0004-Map-volume-and-brightness-events-on-thinkpads.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0003-Map-volume-and-brightness-events-on-thinkpads.patch rename to releases/upstream/2.6.24-rc1/0004-Map-volume-and-brightness-events-on-thinkpads.patch diff --git a/releases/upstream/2.6.24-rc1/0004-ACPI-thinkpad-acpi-make-room-for-more-features-in.patch b/releases/upstream/2.6.24-rc1/0005-ACPI-thinkpad-acpi-make-room-for-more-features-in.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0004-ACPI-thinkpad-acpi-make-room-for-more-features-in.patch rename to releases/upstream/2.6.24-rc1/0005-ACPI-thinkpad-acpi-make-room-for-more-features-in.patch diff --git a/releases/upstream/2.6.24-rc1/0005-ACPI-thinkpad-acpi-issue-EV_SYNC-after-EV_SWITCH.patch b/releases/upstream/2.6.24-rc1/0006-ACPI-thinkpad-acpi-issue-EV_SYNC-after-EV_SWITCH.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0005-ACPI-thinkpad-acpi-issue-EV_SYNC-after-EV_SWITCH.patch rename to releases/upstream/2.6.24-rc1/0006-ACPI-thinkpad-acpi-issue-EV_SYNC-after-EV_SWITCH.patch diff --git a/releases/upstream/2.6.24-rc1/0006-ACPI-thinkpad-acpi-add-mutex-based-locking-to-inpu.patch b/releases/upstream/2.6.24-rc1/0007-ACPI-thinkpad-acpi-add-mutex-based-locking-to-inpu.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0006-ACPI-thinkpad-acpi-add-mutex-based-locking-to-inpu.patch rename to releases/upstream/2.6.24-rc1/0007-ACPI-thinkpad-acpi-add-mutex-based-locking-to-inpu.patch diff --git a/releases/upstream/2.6.24-rc1/0007-ACPI-thinkpad-acpi-keep-track-of-module-state.patch b/releases/upstream/2.6.24-rc1/0008-ACPI-thinkpad-acpi-keep-track-of-module-state.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0007-ACPI-thinkpad-acpi-keep-track-of-module-state.patch rename to releases/upstream/2.6.24-rc1/0008-ACPI-thinkpad-acpi-keep-track-of-module-state.patch diff --git a/releases/upstream/2.6.24-rc1/0008-ACPI-thinkpad-acpi-check-version-of-hot-key-firmwa.patch b/releases/upstream/2.6.24-rc1/0009-ACPI-thinkpad-acpi-check-version-of-hot-key-firmwa.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0008-ACPI-thinkpad-acpi-check-version-of-hot-key-firmwa.patch rename to releases/upstream/2.6.24-rc1/0009-ACPI-thinkpad-acpi-check-version-of-hot-key-firmwa.patch diff --git a/releases/upstream/2.6.24-rc1/0009-ACPI-thinkpad-acpi-dequeue-all-pending-hot-key-eve.patch b/releases/upstream/2.6.24-rc1/0010-ACPI-thinkpad-acpi-dequeue-all-pending-hot-key-eve.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0009-ACPI-thinkpad-acpi-dequeue-all-pending-hot-key-eve.patch rename to releases/upstream/2.6.24-rc1/0010-ACPI-thinkpad-acpi-dequeue-all-pending-hot-key-eve.patch diff --git a/releases/upstream/2.6.24-rc1/0010-ACPI-thinkpad-acpi-fix-regression-on-HKEY-LID-even.patch b/releases/upstream/2.6.24-rc1/0011-ACPI-thinkpad-acpi-fix-regression-on-HKEY-LID-even.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0010-ACPI-thinkpad-acpi-fix-regression-on-HKEY-LID-even.patch rename to releases/upstream/2.6.24-rc1/0011-ACPI-thinkpad-acpi-fix-regression-on-HKEY-LID-even.patch diff --git a/releases/upstream/2.6.24-rc1/0011-ACPI-thinkpad-acpi-use-a-separate-platform-device.patch b/releases/upstream/2.6.24-rc1/0012-ACPI-thinkpad-acpi-use-a-separate-platform-device.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0011-ACPI-thinkpad-acpi-use-a-separate-platform-device.patch rename to releases/upstream/2.6.24-rc1/0012-ACPI-thinkpad-acpi-use-a-separate-platform-device.patch diff --git a/releases/upstream/2.6.24-rc1/0012-ACPI-thinkpad-acpi-duplicate-driver-attributes-to.patch b/releases/upstream/2.6.24-rc1/0013-ACPI-thinkpad-acpi-duplicate-driver-attributes-to.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0012-ACPI-thinkpad-acpi-duplicate-driver-attributes-to.patch rename to releases/upstream/2.6.24-rc1/0013-ACPI-thinkpad-acpi-duplicate-driver-attributes-to.patch diff --git a/releases/upstream/2.6.24-rc1/0013-ACPI-thinkpad-acpi-skip-blanks-before-the-data-whe.patch b/releases/upstream/2.6.24-rc1/0014-ACPI-thinkpad-acpi-skip-blanks-before-the-data-whe.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0013-ACPI-thinkpad-acpi-skip-blanks-before-the-data-whe.patch rename to releases/upstream/2.6.24-rc1/0014-ACPI-thinkpad-acpi-skip-blanks-before-the-data-whe.patch diff --git a/releases/upstream/2.6.24-rc1/0014-spelling-fixes-Documentation.patch b/releases/upstream/2.6.24-rc1/0015-spelling-fixes-Documentation.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0014-spelling-fixes-Documentation.patch rename to releases/upstream/2.6.24-rc1/0015-spelling-fixes-Documentation.patch diff --git a/releases/upstream/2.6.24-rc1/0015-typo-fixes.patch b/releases/upstream/2.6.24-rc1/0016-typo-fixes.patch similarity index 100% rename from releases/upstream/2.6.24-rc1/0015-typo-fixes.patch rename to releases/upstream/2.6.24-rc1/0016-typo-fixes.patch