diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-09 03:29:27 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-09 03:29:27 +0200 |
commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /arch/arm/mach-mx1/Makefile | |
parent | Input: wm97xx - do not access dev->driver_data directly (diff) | |
parent | Linux 2.6.30-rc5 (diff) | |
download | linux-d585a021c0b10b0477d6b608c53e1feb8cde0507.tar.xz linux-d585a021c0b10b0477d6b608c53e1feb8cde0507.zip |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'arch/arm/mach-mx1/Makefile')
-rw-r--r-- | arch/arm/mach-mx1/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mx1/Makefile b/arch/arm/mach-mx1/Makefile index b969719011fa..7f86fe073ec6 100644 --- a/arch/arm/mach-mx1/Makefile +++ b/arch/arm/mach-mx1/Makefile @@ -6,5 +6,9 @@ obj-y += generic.o clock.o devices.o +# Support for CMOS sensor interface +obj-$(CONFIG_MX1_VIDEO) += ksym_mx1.o mx1_camera_fiq.o + # Specific board support obj-$(CONFIG_ARCH_MX1ADS) += mx1ads.o +obj-$(CONFIG_MACH_SCB9328) += scb9328.o
\ No newline at end of file |