diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f (patch) | |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 /drivers/media/dvb/frontends/Makefile | |
| parent | 5d7b605245b1aa1a9cd6549b1f57d69273eb0c37 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/dvb/frontends/Makefile')
| -rw-r--r-- | drivers/media/dvb/frontends/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile index a89dc0fc4c6f..028da55611c0 100644 --- a/drivers/media/dvb/frontends/Makefile +++ b/drivers/media/dvb/frontends/Makefile | |||
| @@ -25,6 +25,7 @@ obj-$(CONFIG_DVB_NXT6000) += nxt6000.o | |||
| 25 | obj-$(CONFIG_DVB_MT352) += mt352.o | 25 | obj-$(CONFIG_DVB_MT352) += mt352.o |
| 26 | obj-$(CONFIG_DVB_ZL10353) += zl10353.o | 26 | obj-$(CONFIG_DVB_ZL10353) += zl10353.o |
| 27 | obj-$(CONFIG_DVB_CX22702) += cx22702.o | 27 | obj-$(CONFIG_DVB_CX22702) += cx22702.o |
| 28 | obj-$(CONFIG_DVB_DRX397XD) += drx397xD.o | ||
| 28 | obj-$(CONFIG_DVB_TDA10021) += tda10021.o | 29 | obj-$(CONFIG_DVB_TDA10021) += tda10021.o |
| 29 | obj-$(CONFIG_DVB_TDA10023) += tda10023.o | 30 | obj-$(CONFIG_DVB_TDA10023) += tda10023.o |
| 30 | obj-$(CONFIG_DVB_STV0297) += stv0297.o | 31 | obj-$(CONFIG_DVB_STV0297) += stv0297.o |