diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 20:34:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 20:34:00 -0500 |
| commit | 478b2a34e7d496b0cc3ae7696362740f954c91ba (patch) | |
| tree | e4a9b4035210bde6d21c70f59371da0882aebcba /arch/sparc/prom/Makefile | |
| parent | b4fe2a03422e6bd20bd8df5e428109a85c9ea961 (diff) | |
| parent | 595a251c0740785fd3c0d2156d78578c7479811e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Write to prom console using indirect buffer.
sparc: Delete prom_*getchar().
sparc: Pass buffer pointer all the way down to prom_{get,put}char().
sparc: Do not export prom_nb{get,put}char().
sparc64: Delete prom_setcallback().
sparc64: Unexport prom_service_exists().
sparc: Kill prom devops_{32,64}.c
sparc: Remove prom_pathtoinode()
sparc64: Delete prom_puts() unused.
SPARC/LEON: removed constant timer initialization as if HZ=100, now it reflects the value of HZ
Diffstat (limited to 'arch/sparc/prom/Makefile')
| -rw-r--r-- | arch/sparc/prom/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/prom/Makefile b/arch/sparc/prom/Makefile index 1b8c073adb44..816c0fa12dc0 100644 --- a/arch/sparc/prom/Makefile +++ b/arch/sparc/prom/Makefile | |||
| @@ -6,7 +6,6 @@ ccflags := -Werror | |||
| 6 | 6 | ||
| 7 | lib-y := bootstr_$(BITS).o | 7 | lib-y := bootstr_$(BITS).o |
| 8 | lib-$(CONFIG_SPARC32) += devmap.o | 8 | lib-$(CONFIG_SPARC32) += devmap.o |
| 9 | lib-y += devops_$(BITS).o | ||
| 10 | lib-y += init_$(BITS).o | 9 | lib-y += init_$(BITS).o |
| 11 | lib-$(CONFIG_SPARC32) += memory.o | 10 | lib-$(CONFIG_SPARC32) += memory.o |
| 12 | lib-y += misc_$(BITS).o | 11 | lib-y += misc_$(BITS).o |