lkml.org 
[lkml]   [2004]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH] PCI fixes for 2.6.4-rc1
    Date
    From
    ChangeSet 1.1618, 2004/02/24 14:02:08-08:00, greg@kroah.com

    PCI Hotplug: remove unneeded ACPI Makefile rules.


    drivers/pci/hotplug/Makefile | 19 +++++--------------
    1 files changed, 5 insertions(+), 14 deletions(-)


    diff -Nru a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile
    --- a/drivers/pci/hotplug/Makefile Fri Feb 27 15:57:13 2004
    +++ b/drivers/pci/hotplug/Makefile Fri Feb 27 15:57:13 2004
    @@ -55,13 +55,6 @@
    shpchp_sysfs.o \
    shpchp_hpc.o

    -ifdef CONFIG_HOTPLUG_PCI_ACPI
    - EXTRA_CFLAGS += -D_LINUX -I$(TOPDIR)/drivers/acpi
    - ifdef CONFIG_ACPI_DEBUG
    - EXTRA_CFLAGS += -DACPI_DEBUG_OUTPUT
    - endif
    -endif
    -
    ifeq ($(CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM),y)
    cpqphp-objs += cpqphp_nvram.o
    endif
    @@ -70,16 +63,14 @@
    pciehp-objs += pciehprm_nonacpi.o
    else
    pciehp-objs += pciehprm_acpi.o
    - EXTRA_CFLAGS += -D_LINUX -I$(TOPDIR)/drivers/acpi -I$(TOPDIR)/drivers/acpi/include
    endif

    ifeq ($(CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY),y)
    shpchp-objs += shpchprm_legacy.o
    else
    - ifeq ($(CONFIG_HOTPLUG_PCI_SHPC_PHPRM_NONACPI),y)
    - shpchp-objs += shpchprm_nonacpi.o
    - else
    - shpchp-objs += shpchprm_acpi.o
    - EXTRA_CFLAGS += -D_LINUX -I$(TOPDIR)/drivers/acpi
    - endif
    + ifeq ($(CONFIG_HOTPLUG_PCI_SHPC_PHPRM_NONACPI),y)
    + shpchp-objs += shpchprm_nonacpi.o
    + else
    + shpchp-objs += shpchprm_acpi.o
    + endif
    endif
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 14:01    [W:0.026 / U:30.900 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site