From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Jan 2008 11:48:03 +0000 (+1100)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.25-rc1~1163
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=21af0297c7e56024a5ccc4d8ad2a590f9ec371ba;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (68 commits)
  [MIPS] remove Documentation/mips/GT64120.README
  [MIPS] Malta: remaining bits of the board support code cleanup
  [MIPS] Malta: make the helper function static
  [MIPS] Malta: fix braces at single statement blocks
  [MIPS] Malta, Atlas: move an extern function declaration to the header file
  [MIPS] Malta: Use C89 style for comments
  [MIPS] Malta: else should follow close brace in malta_int.c
  [MIPS] Malta: remove a superfluous comment
  [MIPS] Malta: include <linux/cpu.h> instead of <asm/cpu.h>
  [MIPS] Malta, Atlas, Sead: remove an extern from .c files
  [MIPS] Malta: fix oversized lines in malta_int.c
  [MIPS] Malta: remove a dead function declaration
  [MIPS] Malta: use tabs not spaces
  [MIPS] Malta: set up the screen info in a separate function
  [MIPS] Malta: check the PCI clock frequency in a separate function
  [MIPS] Malta: use the KERN_ facility level in printk()
  [MIPS] Malta: use Linux kernel style for structure initialization
  [MIPS]: constify function pointer tables
  [MIPS] compat: handle argument endianess of sys32_(f)truncate64 with merge_64
  [MIPS] Cobalt 64-bits kernels can be safely unmarked experimental
  ...
---

21af0297c7e56024a5ccc4d8ad2a590f9ec371ba
diff --cc arch/mips/tx4927/common/Makefile
index e8629617f25,e4a5e464b37..a7fe76a6496
--- a/arch/mips/tx4927/common/Makefile
+++ b/arch/mips/tx4927/common/Makefile
@@@ -1,8 -1,12 +1,8 @@@
  #
  # Makefile for common code for Toshiba TX4927 based systems
  #
 -# Note! Dependencies are done automagically by 'make dep', which also
 -# removes any old dependencies. DON'T put your own dependencies here
 -# unless it's something special (ie not a .c file).
 -#
  
- obj-y	+= tx4927_prom.o tx4927_setup.o tx4927_irq.o
+ obj-y	+= tx4927_prom.o tx4927_irq.o
  
  obj-$(CONFIG_TOSHIBA_FPCIB0)	   += smsc_fdc37m81x.o
  obj-$(CONFIG_KGDB)                 += tx4927_dbgio.o
diff --cc arch/mips/tx4938/common/Makefile
index eff3d1d47f8,c5c6ceaa71c..56aa1ed1ee0
--- a/arch/mips/tx4938/common/Makefile
+++ b/arch/mips/tx4938/common/Makefile
@@@ -1,8 -1,12 +1,8 @@@
  #
  # Makefile for common code for Toshiba TX4927 based systems
  #
 -# Note! Dependencies are done automagically by 'make dep', which also
 -# removes any old dependencies. DON'T put your own dependencies here
 -# unless it's something special (ie not a .c file).
 -#
  
- obj-y	+= prom.o setup.o irq.o
+ obj-y	+= prom.o irq.o
  obj-$(CONFIG_KGDB) += dbgio.o
  
  EXTRA_CFLAGS += -Werror