diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
| commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
| tree | fbdb44317130c371928154c9e6903e699fe2b995 /drivers/Makefile | |
| parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 262b19d6b627..95952c82bf16 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -53,6 +53,7 @@ obj-$(CONFIG_ATA) += ata/ | |||
| 53 | obj-$(CONFIG_TARGET_CORE) += target/ | 53 | obj-$(CONFIG_TARGET_CORE) += target/ |
| 54 | obj-$(CONFIG_MTD) += mtd/ | 54 | obj-$(CONFIG_MTD) += mtd/ |
| 55 | obj-$(CONFIG_SPI) += spi/ | 55 | obj-$(CONFIG_SPI) += spi/ |
| 56 | obj-y += hsi/ | ||
| 56 | obj-y += net/ | 57 | obj-y += net/ |
| 57 | obj-$(CONFIG_ATM) += atm/ | 58 | obj-$(CONFIG_ATM) += atm/ |
| 58 | obj-$(CONFIG_FUSION) += message/ | 59 | obj-$(CONFIG_FUSION) += message/ |