diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-14 10:58:10 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-14 10:58:10 +0100 |
| commit | 37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e (patch) | |
| tree | cd6d6433f1c80475f36b94b7432923b4d4b7b660 /arch/arm/mach-mx1/Makefile | |
| parent | becc670a1bda8f240a93e45d9794f9f79713ffdb (diff) | |
| parent | a8dfb6462a033984b99fee4122fe0799a31f5bb4 (diff) | |
| download | kernel-crypto-37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e.tar.gz kernel-crypto-37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e.tar.xz kernel-crypto-37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e.zip | |
Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
Diffstat (limited to 'arch/arm/mach-mx1/Makefile')
| -rw-r--r-- | arch/arm/mach-mx1/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx1/Makefile b/arch/arm/mach-mx1/Makefile index 7f86fe073ec..297d17210e1 100644 --- a/arch/arm/mach-mx1/Makefile +++ b/arch/arm/mach-mx1/Makefile @@ -10,5 +10,5 @@ obj-y += generic.o clock.o devices.o 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 +obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o +obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o |