From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 23 Jun 2006 05:11:30 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.18-rc1~1081^2~225
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45c091bb2d453ce4a8b06cf19872ec7a77fc4799;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
  [POWERPC] re-enable OProfile for iSeries, using timer interrupt
  [POWERPC] support ibm,extended-*-frequency properties
  [POWERPC] Extra sanity check in EEH code
  [POWERPC] Dont look for class-code in pci children
  [POWERPC] Fix mdelay badness on shared processor partitions
  [POWERPC] disable floating point exceptions for init
  [POWERPC] Unify ppc syscall tables
  [POWERPC] mpic: add support for serial mode interrupts
  [POWERPC] pseries: Print PCI slot location code on failure
  [POWERPC] spufs: one more fix for 64k pages
  [POWERPC] spufs: fail spu_create with invalid flags
  [POWERPC] spufs: clear class2 interrupt status before wakeup
  [POWERPC] spufs: fix Makefile for "make clean"
  [POWERPC] spufs: remove stop_code from struct spu
  [POWERPC] spufs: fix spu irq affinity setting
  [POWERPC] spufs: further abstract priv1 register access
  [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
  [POWERPC] spufs: dont try to access SPE channel 1 count
  [POWERPC] spufs: use kzalloc in create_spu
  [POWERPC] spufs: fix initial state of wbox file
  ...

Manually resolved conflicts in:
	drivers/net/phy/Makefile
	include/asm-powerpc/spu.h
---

45c091bb2d453ce4a8b06cf19872ec7a77fc4799
diff --cc drivers/net/phy/Kconfig
index cda3e53d69,76e51b1baf..2ba6d3a40e
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@@ -44,12 -44,11 +44,17 @@@ config CICADA_PH
  	depends on PHYLIB
  	---help---
  	  Currently supports the cis8204
+ config VITESSE_PHY
+         tristate "Drivers for the Vitesse PHYs"
+         depends on PHYLIB
+         ---help---
+           Currently supports the vsc8244
  
 +config SMSC_PHY
 +	tristate "Drivers for SMSC PHYs"
 +	depends on PHYLIB
 +	---help---
 +	  Currently supports the LAN83C185 PHY
 +
  endmenu
  
diff --cc drivers/net/phy/Makefile
index d9614134cc,a8d066eab6..a00e619425
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@@ -8,4 -8,4 +8,5 @@@ obj-$(CONFIG_DAVICOM_PHY)	+= davicom.
  obj-$(CONFIG_CICADA_PHY)	+= cicada.o
  obj-$(CONFIG_LXT_PHY)		+= lxt.o
  obj-$(CONFIG_QSEMI_PHY)		+= qsemi.o
 +obj-$(CONFIG_SMSC_PHY)		+= smsc.o
+ obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
diff --cc include/asm-powerpc/page.h
index f0469b9613,a315d0c0d9..fb597b37c2
--- a/include/asm-powerpc/page.h
+++ b/include/asm-powerpc/page.h
@@@ -11,7 -11,9 +11,8 @@@
   */
  
  #ifdef __KERNEL__
 -#include <linux/config.h>
  #include <asm/asm-compat.h>
+ #include <asm/kdump.h>
  
  /*
   * On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software
diff --cc include/asm-powerpc/spu.h
index 95713f3973,c0290f9d20..9609d3ee87
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@@ -24,8 -24,9 +24,8 @@@
  #define _SPU_H
  #ifdef __KERNEL__
  
- #include <linux/kref.h>
 -#include <linux/config.h>
  #include <linux/workqueue.h>
+ #include <linux/sysdev.h>
  
  #define LS_SIZE (256 * 1024)
  #define LS_ADDR_MASK (LS_SIZE - 1)