diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:29:06 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:29:06 -0500 |
| commit | ea9b395fe20ac74be788f415af2622ac8f0c35c7 (patch) | |
| tree | d1653e1a4cbe360aa7132ea4e29ab92a02038224 /drivers/Makefile | |
| parent | 61420e147a706ee7c7a902008045547fb2a2a330 (diff) | |
| parent | 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index ea410b6b7644..7c45050ecd03 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -13,6 +13,7 @@ obj-$(CONFIG_ACPI) += acpi/ | |||
| 13 | # PnP must come after ACPI since it will eventually need to check if acpi | 13 | # PnP must come after ACPI since it will eventually need to check if acpi |
| 14 | # was used and do nothing if so | 14 | # was used and do nothing if so |
| 15 | obj-$(CONFIG_PNP) += pnp/ | 15 | obj-$(CONFIG_PNP) += pnp/ |
| 16 | obj-$(CONFIG_ARM_AMBA) += amba/ | ||
| 16 | 17 | ||
| 17 | # char/ comes before serial/ etc so that the VT console is the boot-time | 18 | # char/ comes before serial/ etc so that the VT console is the boot-time |
| 18 | # default. | 19 | # default. |
| @@ -40,6 +41,7 @@ obj-$(CONFIG_FUSION) += message/ | |||
| 40 | obj-$(CONFIG_IEEE1394) += ieee1394/ | 41 | obj-$(CONFIG_IEEE1394) += ieee1394/ |
| 41 | obj-y += cdrom/ | 42 | obj-y += cdrom/ |
| 42 | obj-$(CONFIG_MTD) += mtd/ | 43 | obj-$(CONFIG_MTD) += mtd/ |
| 44 | obj-$(CONFIG_SPI) += spi/ | ||
| 43 | obj-$(CONFIG_PCCARD) += pcmcia/ | 45 | obj-$(CONFIG_PCCARD) += pcmcia/ |
| 44 | obj-$(CONFIG_DIO) += dio/ | 46 | obj-$(CONFIG_DIO) += dio/ |
| 45 | obj-$(CONFIG_SBUS) += sbus/ | 47 | obj-$(CONFIG_SBUS) += sbus/ |