Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (158 commits) commit 4f705ae3 Author: Bjorn Helgaas <bjorn.helgaas@hp.com> Date: Mon Apr 3 17:09:22 2006 -0700 [PATCH] DMI: move dmi_scan.c from arch/i386 to drivers/firmware/ dmi_scan.c is arch-independent and is used by i386, x86_64, and ia64. Currently all three arches compile it from arch/i386, which means that ia64 and x86_64 depend on things in arch/i386 that they wouldn't otherwise care about. This is simply "mv arch/i386/kernel/dmi_scan.c drivers/firmware/" (removing trailing whitespace) and the associated Makefile changes. All three architectures already set CONFIG_DMI in their top-level Kconfig files. Signed-off-by:Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Andi Kleen <ak@muc.de> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Andrey Panin <pazke@orbita1.ru> Signed-off-by:
Andrew Morton <akpm@osdl.org> ...
No related branches found
No related tags found
Showing
- arch/i386/kernel/Makefile 1 addition, 1 deletionarch/i386/kernel/Makefile
- arch/ia64/kernel/Makefile 1 addition, 2 deletionsarch/ia64/kernel/Makefile
- arch/x86_64/kernel/Makefile 1 addition, 3 deletionsarch/x86_64/kernel/Makefile
- drivers/base/bus.c 5 additions, 0 deletionsdrivers/base/bus.c
- drivers/base/class.c 6 additions, 7 deletionsdrivers/base/class.c
- drivers/base/dd.c 1 addition, 1 deletiondrivers/base/dd.c
- drivers/base/power/suspend.c 12 additions, 0 deletionsdrivers/base/power/suspend.c
- drivers/firmware/Makefile 2 additions, 1 deletiondrivers/firmware/Makefile
- drivers/firmware/dmi_scan.c 6 additions, 6 deletionsdrivers/firmware/dmi_scan.c
- drivers/md/md.c 1 addition, 0 deletionsdrivers/md/md.c
- drivers/pci/pci-driver.c 4 additions, 2 deletionsdrivers/pci/pci-driver.c
- drivers/pci/pci.c 4 additions, 2 deletionsdrivers/pci/pci.c
- drivers/usb/core/hcd-pci.c 3 additions, 4 deletionsdrivers/usb/core/hcd-pci.c
- fs/partitions/check.c 30 additions, 8 deletionsfs/partitions/check.c
- fs/sysfs/dir.c 1 addition, 0 deletionsfs/sysfs/dir.c
- fs/sysfs/file.c 76 additions, 0 deletionsfs/sysfs/file.c
- fs/sysfs/sysfs.h 1 addition, 0 deletionsfs/sysfs/sysfs.h
- include/linux/genhd.h 1 addition, 0 deletionsinclude/linux/genhd.h
- include/linux/kobject.h 2 additions, 0 deletionsinclude/linux/kobject.h
- include/linux/pm.h 8 additions, 0 deletionsinclude/linux/pm.h
Loading
Please register or sign in to comment