diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-02 22:41:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-02 22:41:36 +0100 |
| commit | 923a789b49c7269a0245d5af6afe486188d940df (patch) | |
| tree | c3f168427372e64f7467a794f313416da5086ba0 /arch/arm/mach-mx1/Makefile | |
| parent | 103ceffb9501531f6931df6aebc11a05189201f0 (diff) | |
| parent | b840d79631c882786925303c2b0f4fefc31845ed (diff) | |
| download | linux-stable-923a789b49c7269a0245d5af6afe486188d940df.tar.gz linux-stable-923a789b49c7269a0245d5af6afe486188d940df.tar.bz2 linux-stable-923a789b49c7269a0245d5af6afe486188d940df.zip | |
Merge branch 'linus' into x86/cleanups
Conflicts:
arch/x86/kernel/reboot.c
Diffstat (limited to 'arch/arm/mach-mx1/Makefile')
| -rw-r--r-- | arch/arm/mach-mx1/Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-mx1/Makefile b/arch/arm/mach-mx1/Makefile new file mode 100644 index 000000000000..b969719011fa --- /dev/null +++ b/arch/arm/mach-mx1/Makefile @@ -0,0 +1,10 @@ +# +# Makefile for the linux kernel. +# + +# Object file lists. + +obj-y += generic.o clock.o devices.o + +# Specific board support +obj-$(CONFIG_ARCH_MX1ADS) += mx1ads.o |