diff options
| author | Anton Altaparmakov <aia21@cam.ac.uk> | 2002-03-17 18:33:44 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@drop.stormcorp.org> | 2002-03-17 18:33:44 +0000 |
| commit | 3cc589c414b4e08b6f967d41cbd4e65df14ef5e3 (patch) | |
| tree | 96c10a932f3c2f808bdbd459eca9c36b6ca354fe /drivers | |
| parent | ca2faf4b829b8798f193e4b857dc1dda5020def5 (diff) | |
| parent | 0b2e8f296ddf468918463779974ef88f5f9d42d7 (diff) | |
Merge cam.ac.uk:/usr/src/bklinux-2.5
into cam.ac.uk:/usr/src/bkntfs-tng-2.5
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Makefile | 8 | ||||
| -rw-r--r-- | drivers/acpi/acpi_bus.c | 2 | ||||
| -rw-r--r-- | drivers/base/core.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index bef68552c4c3..24a9490ddfaa 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -8,12 +8,14 @@ mod-subdirs := dio mtd sbus video macintosh usb input telephony sgi ide \ message/i2o message/fusion scsi md ieee1394 pnp isdn atm \ - fc4 net/hamradio i2c acpi bluetooth input/serio input/gameport + fc4 net/hamradio i2c acpi bluetooth input/serio \ + input/gameport parport hotplug -subdir-y := base parport char block net misc media cdrom hotplug +subdir-y := base char block net misc media cdrom subdir-m := $(subdir-y) - +subdir-$(CONFIG_PARPORT) += parport +subdir-$(CONFIG_HOTPLUG_PCI) += hotplug subdir-$(CONFIG_DIO) += dio subdir-$(CONFIG_PCI) += pci subdir-$(CONFIG_PCMCIA) += pcmcia diff --git a/drivers/acpi/acpi_bus.c b/drivers/acpi/acpi_bus.c index c900ce735f52..fd9ba14f7e1c 100644 --- a/drivers/acpi/acpi_bus.c +++ b/drivers/acpi/acpi_bus.c @@ -1464,7 +1464,7 @@ acpi_bus_add ( */ switch (type) { case ACPI_BUS_TYPE_SYSTEM: - sprintf(device->pnp.bus_id, "%s", "root"); + sprintf(device->pnp.bus_id, "%s", "ACPI"); break; case ACPI_BUS_TYPE_POWER_BUTTON: sprintf(device->pnp.bus_id, "%s", "PWRF"); diff --git a/drivers/base/core.c b/drivers/base/core.c index 575bbf35b0e2..fd968fb79d5c 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -139,7 +139,7 @@ static int __init device_init(void) return error; } -subsys_initcall(device_init); +core_initcall(device_init); EXPORT_SYMBOL(device_register); EXPORT_SYMBOL(put_device); |