Merge branch 'thinkpad-2.6.32' into release (64441795) · Commits · 戴 / test

drivers/acpi/blacklist.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -224,6 +224,7 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
		* _OSI(Linux) helps sound
		* DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad R61"),
		* DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T61"),
		* T400, T500
		* _OSI(Linux) has Linux specific hooks
		* DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),
		* _OSI(Linux) is a NOP:
		@@ -254,6 +255,22 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),
		},
		},
		{
		.callback = dmi_enable_osi_linux,
		.ident = "Lenovo ThinkPad T400",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T400"),
		},
		},
		{
		.callback = dmi_enable_osi_linux,
		.ident = "Lenovo ThinkPad T500",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T500"),
		},
		},
		{}
		};

drivers/platform/x86/thinkpad_acpi.c

+19 −7

Original line number	Diff line number	Diff line
		@@ -1680,36 +1680,48 @@ static void tpacpi_remove_driver_attributes(struct device_driver *drv)
		\| (__bv1) << 8 \| (__bv2) }

		#define TPV_Q_X(__v, __bid1, __bid2, __bv1, __bv2, \
		__eid1, __eid2, __ev1, __ev2) \
		__eid, __ev1, __ev2) \
		{ .vendor = (__v), \
		.bios = TPID(__bid1, __bid2), \
		.ec = TPID(__eid1, __eid2), \
		.ec = __eid, \
		.quirks = (__ev1) << 24 \| (__ev2) << 16 \
		\| (__bv1) << 8 \| (__bv2) }

		#define TPV_QI0(__id1, __id2, __bv1, __bv2) \
		TPV_Q(PCI_VENDOR_ID_IBM, __id1, __id2, __bv1, __bv2)

		/* Outdated IBM BIOSes often lack the EC id string */
		#define TPV_QI1(__id1, __id2, __bv1, __bv2, __ev1, __ev2) \
		TPV_Q_X(PCI_VENDOR_ID_IBM, __id1, __id2, \
		__bv1, __bv2, __id1, __id2, __ev1, __ev2)
		__bv1, __bv2, TPID(__id1, __id2), \
		__ev1, __ev2), \
		TPV_Q_X(PCI_VENDOR_ID_IBM, __id1, __id2, \
		__bv1, __bv2, TPACPI_MATCH_UNKNOWN, \
		__ev1, __ev2)

		/* Outdated IBM BIOSes often lack the EC id string */
		#define TPV_QI2(__bid1, __bid2, __bv1, __bv2, \
		__eid1, __eid2, __ev1, __ev2) \
		TPV_Q_X(PCI_VENDOR_ID_IBM, __bid1, __bid2, \
		__bv1, __bv2, __eid1, __eid2, __ev1, __ev2)
		__bv1, __bv2, TPID(__eid1, __eid2), \
		__ev1, __ev2), \
		TPV_Q_X(PCI_VENDOR_ID_IBM, __bid1, __bid2, \
		__bv1, __bv2, TPACPI_MATCH_UNKNOWN, \
		__ev1, __ev2)

		#define TPV_QL0(__id1, __id2, __bv1, __bv2) \
		TPV_Q(PCI_VENDOR_ID_LENOVO, __id1, __id2, __bv1, __bv2)

		#define TPV_QL1(__id1, __id2, __bv1, __bv2, __ev1, __ev2) \
		TPV_Q_X(PCI_VENDOR_ID_LENOVO, __id1, __id2, \
		__bv1, __bv2, __id1, __id2, __ev1, __ev2)
		__bv1, __bv2, TPID(__id1, __id2), \
		__ev1, __ev2)

		#define TPV_QL2(__bid1, __bid2, __bv1, __bv2, \
		__eid1, __eid2, __ev1, __ev2) \
		TPV_Q_X(PCI_VENDOR_ID_LENOVO, __bid1, __bid2, \
		__bv1, __bv2, __eid1, __eid2, __ev1, __ev2)
		__bv1, __bv2, TPID(__eid1, __eid2), \
		__ev1, __ev2)

		static const struct tpacpi_quirk tpacpi_bios_version_qtable[] __initconst = {
		/* Numeric models ------------------ */
		@@ -6313,7 +6325,7 @@ static int brightness_write(char *buf)
		* Doing it this way makes the syscall restartable in case of EINTR
		*/
		rc = brightness_set(level);
		return (rc == -EINTR)? ERESTARTSYS : rc;
		return (rc == -EINTR)? -ERESTARTSYS : rc;
		}

		static struct ibm_struct brightness_driver_data = {

Admin message