diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-06 18:46:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-06 18:46:39 -0500 |
| commit | c03296a868ae7c91aa2d8b372184763b18f16d7a (patch) | |
| tree | 57ff0b44a412b78fe598a49cc28b3cebf51f1154 /drivers | |
| parent | e3f749c4af69c4344d89f11e2293e3790eb4eaca (diff) | |
| parent | 913e4a75572354995b330f57082d9a86250cd75f (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 619dd964c51c..5c69b86db624 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -69,7 +69,7 @@ obj-$(CONFIG_EISA) += eisa/ | |||
| 69 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ | 69 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ |
| 70 | obj-$(CONFIG_MMC) += mmc/ | 70 | obj-$(CONFIG_MMC) += mmc/ |
| 71 | obj-$(CONFIG_INFINIBAND) += infiniband/ | 71 | obj-$(CONFIG_INFINIBAND) += infiniband/ |
| 72 | obj-$(CONFIG_SGI_IOC4) += sn/ | 72 | obj-$(CONFIG_SGI_SN) += sn/ |
| 73 | obj-y += firmware/ | 73 | obj-y += firmware/ |
| 74 | obj-$(CONFIG_CRYPTO) += crypto/ | 74 | obj-$(CONFIG_CRYPTO) += crypto/ |
| 75 | obj-$(CONFIG_SUPERH) += sh/ | 75 | obj-$(CONFIG_SUPERH) += sh/ |