diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
commit | 25d3f1622fdbc73db3f6860961b5fb3035a39f32 (patch) | |
tree | f4eef88bc0083f282c64c14e81c0ecc95e5f2b43 /arch/sparc/Makefile | |
parent | dc3edd5412341b02d84144ddfd5bf6ccaaeeb1ac (diff) | |
parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/sparc/Makefile')
-rw-r--r-- | arch/sparc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index dea48f6cff3..4cdbb2d59ed 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile @@ -34,7 +34,7 @@ libs-y += arch/sparc/prom/ arch/sparc/lib/ # Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-) INIT_Y := $(patsubst %/, %/built-in.o, $(init-y)) CORE_Y := $(core-y) -CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ +CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ CORE_Y := $(patsubst %/, %/built-in.o, $(CORE_Y)) DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y)) NET_Y := $(patsubst %/, %/built-in.o, $(net-y)) |