diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-03-26 10:55:59 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-03-26 10:55:59 -0400 |
| commit | 329f9052dbadf6f4afe2231668bd00c579a4aa10 (patch) | |
| tree | e080a5c70df40f3ae8cf28a95a3267757668ab97 /arch/arm/mach-mx1/Makefile | |
| parent | 395b228858778d3c44f7c413693a6acaa8bb62dc (diff) | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/nand/sh_flctl.c
Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().
Diffstat (limited to 'arch/arm/mach-mx1/Makefile')
| -rw-r--r-- | arch/arm/mach-mx1/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-mx1/Makefile b/arch/arm/mach-mx1/Makefile index 7f86fe073ec6..fc2ddf82441b 100644 --- a/arch/arm/mach-mx1/Makefile +++ b/arch/arm/mach-mx1/Makefile | |||
| @@ -4,11 +4,12 @@ | |||
| 4 | 4 | ||
| 5 | # Object file lists. | 5 | # Object file lists. |
| 6 | 6 | ||
| 7 | EXTRA_CFLAGS += -DIMX_NEEDS_DEPRECATED_SYMBOLS | ||
| 7 | obj-y += generic.o clock.o devices.o | 8 | obj-y += generic.o clock.o devices.o |
| 8 | 9 | ||
| 9 | # Support for CMOS sensor interface | 10 | # Support for CMOS sensor interface |
| 10 | obj-$(CONFIG_MX1_VIDEO) += ksym_mx1.o mx1_camera_fiq.o | 11 | obj-$(CONFIG_MX1_VIDEO) += ksym_mx1.o mx1_camera_fiq.o |
| 11 | 12 | ||
| 12 | # Specific board support | 13 | # Specific board support |
| 13 | obj-$(CONFIG_ARCH_MX1ADS) += mx1ads.o | 14 | obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o |
| 14 | obj-$(CONFIG_MACH_SCB9328) += scb9328.o \ No newline at end of file | 15 | obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o |