diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 18:49:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 18:49:27 -0500 |
| commit | 94d40b699f0b9fb1b1da3b6abcd31d37c9aa2c22 (patch) | |
| tree | c719fbb7e7d44d74b4d7b571f7ed3f0d338daf71 /arch/sparc/Makefile | |
| parent | 062dfa433cce9a2c3941b3b8b96ae678f11230fa (diff) | |
| parent | 1df2ab48f995b1599740a3f430df77fe24cb8ce9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
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 dea48f6cff38..4cdbb2d59ed0 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile | |||
| @@ -34,7 +34,7 @@ libs-y += arch/sparc/prom/ arch/sparc/lib/ | |||
| 34 | # Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-) | 34 | # Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-) |
| 35 | INIT_Y := $(patsubst %/, %/built-in.o, $(init-y)) | 35 | INIT_Y := $(patsubst %/, %/built-in.o, $(init-y)) |
| 36 | CORE_Y := $(core-y) | 36 | CORE_Y := $(core-y) |
| 37 | CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ | 37 | CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ |
| 38 | CORE_Y := $(patsubst %/, %/built-in.o, $(CORE_Y)) | 38 | CORE_Y := $(patsubst %/, %/built-in.o, $(CORE_Y)) |
| 39 | DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y)) | 39 | DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y)) |
| 40 | NET_Y := $(patsubst %/, %/built-in.o, $(net-y)) | 40 | NET_Y := $(patsubst %/, %/built-in.o, $(net-y)) |