diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-07 05:11:05 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-07 05:11:05 -0500 |
| commit | dece696076936434eb49e43eb2d59ca35cb94376 (patch) | |
| tree | 1ac54cdb0d5c0b3b2afe0f7f9f3e1165704cbc82 /drivers | |
| parent | fc3fba60f5d292a3b875e2498577fc35bd68b9da (diff) | |
| parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (diff) | |
Merge branch 'origin'
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/ |