diff for duplicates of <20040920093532.D14208@unix-os.sc.intel.com> diff --git a/a/1.txt b/N1/1.txt index 0ead949..ea832a1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,8 +39,7 @@ diff -puN drivers/acpi/scan.c~acpi_core_eject drivers/acpi/scan.c + ACPI hotplug Eject support + -------------------------------------------------------------------------- */ +static ssize_t acpi_eject_store(struct subsystem *subsys, const char *buf, size_t count); -+static struct subsys_attribute acpi_eject_attr = -+ __ATTR(eject,0200,NULL,acpi_eject_store); ++static struct subsys_attribute acpi_eject_attr + __ATTR(eject,0200,NULL,acpi_eject_store); + +/* + * evaluate _EJ0, detach driver, and remove from ACPI bus @@ -132,7 +131,7 @@ diff -puN drivers/acpi/scan.c~acpi_core_eject drivers/acpi/scan.c + goto err; + } +#ifndef FORCE_EJECT -+ if (device->driver == NULL) { ++ if (device->driver = NULL) { + ret = -ENODEV; + goto err; + } @@ -147,7 +146,7 @@ diff -puN drivers/acpi/scan.c~acpi_core_eject drivers/acpi/scan.c + /* + * remove from ACPI bus. + */ -+ if (type == ACPI_BUS_TYPE_PROCESSOR) ++ if (type = ACPI_BUS_TYPE_PROCESSOR) + acpi_bus_trim(device, 0); + else + acpi_bus_trim(device, 1); diff --git a/a/content_digest b/N1/content_digest index 756cab3..f824905 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020040920092520.A14208@unix-os.sc.intel.com\0" "From\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" "Subject\0PATCH-ACPI based CPU hotplug[2/6]-ACPI Eject interface support\0" - "Date\0Mon, 20 Sep 2004 09:35:33 -0700\0" + "Date\0Mon, 20 Sep 2004 16:35:33 +0000\0" "To\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" "Cc\0Brown" Len <len.brown@intel.com> @@ -52,8 +52,7 @@ "+ ACPI hotplug Eject support\n" "+ -------------------------------------------------------------------------- */\n" "+static ssize_t acpi_eject_store(struct subsystem *subsys, const char *buf, size_t count);\n" - "+static struct subsys_attribute acpi_eject_attr =\n" - "+\t__ATTR(eject,0200,NULL,acpi_eject_store);\n" + "+static struct subsys_attribute acpi_eject_attr +\t__ATTR(eject,0200,NULL,acpi_eject_store);\n" "+\n" "+/*\n" "+ * evaluate _EJ0, detach driver, and remove from ACPI bus\n" @@ -145,7 +144,7 @@ "+\t\tgoto err;\n" "+\t}\n" "+#ifndef FORCE_EJECT\n" - "+\tif (device->driver == NULL) {\n" + "+\tif (device->driver = NULL) {\n" "+\t\tret = -ENODEV;\n" "+\t\tgoto err;\n" "+\t}\n" @@ -160,7 +159,7 @@ "+\t/*\n" "+\t * remove from ACPI bus.\n" "+\t */\n" - "+\tif (type == ACPI_BUS_TYPE_PROCESSOR)\n" + "+\tif (type = ACPI_BUS_TYPE_PROCESSOR)\n" "+\t\tacpi_bus_trim(device, 0);\n" "+\telse\n" "+\t\tacpi_bus_trim(device, 1);\n" @@ -201,4 +200,4 @@ " }\n" _ -e16b993b4ec6161210432dead4648a4af6a410a4623b41d91fe73244e3c4db44 +35812a8ffa9333d95f8109ec195d8e5f06be8a7c0a1d465c8c94023dab343c04
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.