From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org
Subject: Re: [PATCH] PCI Hotplug fixes for 2.6.4-rc1
Date: Tue, 2 Mar 2004 20:21:46 -0800 [thread overview]
Message-ID: <10782877061347@kroah.com> (raw)
In-Reply-To: <10782877061393@kroah.com>
ChangeSet 1.1625, 2004/03/02 19:25:34-08:00, greg@kroah.com
PCI Hotplug: clean up the Makefile a bit more.
drivers/pci/hotplug/Makefile | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff -Nru a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile
--- a/drivers/pci/hotplug/Makefile Tue Mar 2 19:42:02 2004
+++ b/drivers/pci/hotplug/Makefile Tue Mar 2 19:42:02 2004
@@ -50,13 +50,10 @@
pciehp_pci.o \
pciehp_sysfs.o \
pciehp_hpc.o
-
-ifdef CONFIG_HOTPLUG_PCI_PCIE
- ifdef CONFIG_ACPI_BUS
- pciehp-objs += pciehprm_acpi.o
- else
- pciehp-objs += pciehprm_nonacpi.o
- endif
+ifdef CONFIG_ACPI_BUS
+ pciehp-objs += pciehprm_acpi.o
+else
+ pciehp-objs += pciehprm_nonacpi.o
endif
shpchp-objs := shpchp_core.o \
@@ -64,15 +61,12 @@
shpchp_pci.o \
shpchp_sysfs.o \
shpchp_hpc.o
-
-ifdef CONFIG_HOTPLUG_PCI_SHPC
- ifdef CONFIG_ACPI_BUS
- shpchp-objs += shpchprm_acpi.o
- else
- ifdef CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY
- shpchp-objs += shpchprm_legacy.o
- else
- shpchp-objs += shpchprm_nonacpi.o
- endif
- endif
+ifdef CONFIG_ACPI_BUS
+ shpchp-objs += shpchprm_acpi.o
+else
+ ifdef CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY
+ shpchp-objs += shpchprm_legacy.o
+ else
+ shpchp-objs += shpchprm_nonacpi.o
+ endif
endif
next prev parent reply other threads:[~2004-03-03 4:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-03-03 4:20 [BK PATCH] PCI Hotplug fixes for 2.6.4-rc1 Greg KH
2004-03-03 4:21 ` [PATCH] " Greg KH
2004-03-03 4:21 ` Greg KH
2004-03-03 4:21 ` Greg KH
2004-03-03 4:21 ` Greg KH
2004-03-03 4:21 ` Greg KH [this message]
2004-03-04 6:17 ` Ingo Oeser
2004-03-04 18:27 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10782877061347@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.