diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 15:50:51 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 15:50:51 +0100 |
commit | b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7 (patch) | |
tree | 030ef62361042d1a034087ad9a726db3b57bba72 /arch/arm/mach-ixp2000/Makefile | |
parent | NTFS: Fix two compiler warnings on Alpha. Thanks to Andrew Morton for (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff) | |
download | linux-b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7.tar.xz linux-b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7.zip |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/arm/mach-ixp2000/Makefile')
-rw-r--r-- | arch/arm/mach-ixp2000/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/Makefile b/arch/arm/mach-ixp2000/Makefile index 9621aeb61f46..1e6139d42a92 100644 --- a/arch/arm/mach-ixp2000/Makefile +++ b/arch/arm/mach-ixp2000/Makefile @@ -1,7 +1,7 @@ # # Makefile for the linux kernel. # -obj-y := core.o pci.o uengine.o +obj-y := core.o pci.o obj-m := obj-n := obj- := |