Merge with 2.3.19.

3 files changed, 36 insertions, 36 deletions

diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index 1c71f473f..737abbebf 100644
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -152,13 +152,13 @@ struct cpm_enet_private {
 	unsigned long lock;
 };
 
-static int cpm_enet_open(struct device *dev);
-static int cpm_enet_start_xmit(struct sk_buff *skb, struct device *dev);
-static int cpm_enet_rx(struct device *dev);
+static int cpm_enet_open(struct net_device *dev);
+static int cpm_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);
+static int cpm_enet_rx(struct net_device *dev);
 static void cpm_enet_interrupt(void *dev_id);
-static int cpm_enet_close(struct device *dev);
-static struct net_device_stats *cpm_enet_get_stats(struct device *dev);
-static void set_multicast_list(struct device *dev);
+static int cpm_enet_close(struct net_device *dev);
+static struct net_device_stats *cpm_enet_get_stats(struct net_device *dev);
+static void set_multicast_list(struct net_device *dev);
 
 /* Get this from various configuration locations (depends on board).
 */
@@ -181,7 +181,7 @@ static void set_multicast_list(struct device *dev);
 #endif
 
 static int
-cpm_enet_open(struct device *dev)
+cpm_enet_open(struct net_device *dev)
 {
 
 	/* I should reset the ring buffers here, but I don't yet know
@@ -196,7 +196,7 @@ cpm_enet_open(struct device *dev)
 }
 
 static int
-cpm_enet_start_xmit(struct sk_buff *skb, struct device *dev)
+cpm_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct cpm_enet_private *cep = (struct cpm_enet_private *)dev->priv;
 	volatile cbd_t	*bdp;
@@ -326,7 +326,7 @@ cpm_enet_start_xmit(struct sk_buff *skb, struct device *dev)
 static void
 cpm_enet_interrupt(void *dev_id)
 {
-	struct	device *dev = dev_id;
+	struct net_device *dev = dev_id;
 	volatile struct	cpm_enet_private *cep;
 	volatile cbd_t	*bdp;
 	ushort	int_events;
@@ -503,7 +503,7 @@ cpm_enet_interrupt(void *dev_id)
  * effectively tossing the packet.
  */
 static int
-cpm_enet_rx(struct device *dev)
+cpm_enet_rx(struct net_device *dev)
 {
 	struct	cpm_enet_private *cep;
 	volatile cbd_t	*bdp;
@@ -597,7 +597,7 @@ for (;;) {
 }
 
 static int
-cpm_enet_close(struct device *dev)
+cpm_enet_close(struct net_device *dev)
 {
 	/* Don't know what to do yet.
 	*/
@@ -605,7 +605,7 @@ cpm_enet_close(struct device *dev)
 	return 0;
 }
 
-static struct net_device_stats *cpm_enet_get_stats(struct device *dev)
+static struct net_device_stats *cpm_enet_get_stats(struct net_device *dev)
 {
 	struct cpm_enet_private *cep = (struct cpm_enet_private *)dev->priv;
 
@@ -622,7 +622,7 @@ static struct net_device_stats *cpm_enet_get_stats(struct device *dev)
  * this kind of feature?).
  */
 
-static void set_multicast_list(struct device *dev)
+static void set_multicast_list(struct net_device *dev)
 {
 	struct	cpm_enet_private *cep;
 	struct	dev_mc_list *dmi;
@@ -701,7 +701,7 @@ static void set_multicast_list(struct device *dev)
 int __init cpm_enet_init() { m8xx_enet_init(); }
 int __init m8xx_enet_init(void)
 {
-	struct device *dev;
+	struct net_device *dev;
 	struct cpm_enet_private *cep;
 	int i, j;
 	unsigned char	*eap;
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index 2b797a498..fb12757f5 100644
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -106,14 +106,14 @@ struct fec_enet_private {
 	unsigned long lock;
 };
 
-static int fec_enet_open(struct device *dev);
-static int fec_enet_start_xmit(struct sk_buff *skb, struct device *dev);
-static int fec_enet_rx(struct device *dev);
-static void fec_enet_mii(struct device *dev);
+static int fec_enet_open(struct net_device *dev);
+static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);
+static int fec_enet_rx(struct net_device *dev);
+static void fec_enet_mii(struct net_device *dev);
 static	void fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs);
-static int fec_enet_close(struct device *dev);
-static struct net_device_stats *fec_enet_get_stats(struct device *dev);
-static void set_multicast_list(struct device *dev);
+static int fec_enet_close(struct net_device *dev);
+static struct net_device_stats *fec_enet_get_stats(struct net_device *dev);
+static void set_multicast_list(struct net_device *dev);
 
 static	ushort	my_enet_addr[] = { 0x0800, 0x3e26, 0x1559 };
 
@@ -142,7 +142,7 @@ static int	mii_queue(int request, void (*func)(int));
 						(VAL & 0xffff))
 
 static int
-fec_enet_open(struct device *dev)
+fec_enet_open(struct net_device *dev)
 {
 
 	/* I should reset the ring buffers here, but I don't yet know
@@ -157,7 +157,7 @@ fec_enet_open(struct device *dev)
 }
 
 static int
-fec_enet_start_xmit(struct sk_buff *skb, struct device *dev)
+fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct fec_enet_private *fep = (struct fec_enet_private *)dev->priv;
 	volatile cbd_t	*bdp;
@@ -282,7 +282,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct device *dev)
 static	void
 fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs)
 {
-	struct	device *dev = dev_id;
+	struct net_device *dev = dev_id;
 	struct	fec_enet_private *fep;
 	volatile cbd_t	*bdp;
 	volatile fec_t	*ep;
@@ -393,7 +393,7 @@ fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs)
  * effectively tossing the packet.
  */
 static int
-fec_enet_rx(struct device *dev)
+fec_enet_rx(struct net_device *dev)
 {
 	struct	fec_enet_private *fep;
 	volatile cbd_t *bdp;
@@ -506,7 +506,7 @@ for (;;) {
 }
 
 static void
-fec_enet_mii(struct device *dev)
+fec_enet_mii(struct net_device *dev)
 {
 	struct	fec_enet_private *fep;
 	volatile fec_t	*ep;
@@ -676,7 +676,7 @@ mii_relink(uint mii_reg)
 static	void
 mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs)
 {
-	struct	device *dev = dev_id;
+	struct net_device *dev = dev_id;
 	struct	fec_enet_private *fep;
 	volatile fec_t	*ep;
 
@@ -696,7 +696,7 @@ mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs)
 }
 
 static int
-fec_enet_close(struct device *dev)
+fec_enet_close(struct net_device *dev)
 {
 	/* Don't know what to do yet.
 	*/
@@ -704,7 +704,7 @@ fec_enet_close(struct device *dev)
 	return 0;
 }
 
-static struct net_device_stats *fec_enet_get_stats(struct device *dev)
+static struct net_device_stats *fec_enet_get_stats(struct net_device *dev)
 {
 	struct fec_enet_private *fep = (struct fec_enet_private *)dev->priv;
 
@@ -721,7 +721,7 @@ static struct net_device_stats *fec_enet_get_stats(struct device *dev)
  * this kind of feature?).
  */
 
-static void set_multicast_list(struct device *dev)
+static void set_multicast_list(struct net_device *dev)
 {
 	struct	fec_enet_private *fep;
 	struct	dev_mc_list *dmi;
@@ -790,9 +790,9 @@ static void set_multicast_list(struct device *dev)
 
 /* Initialize the FECC Ethernet on 860T.
  */
-__initfunc(int m8xx_enet_init(void))
+int __init m8xx_enet_init(void)
 {
-	struct device *dev;
+	struct net_device *dev;
 	struct fec_enet_private *fep;
 	int i, j;
 	unsigned char	*eap;
diff --git a/arch/ppc/8xx_io/uart.c b/arch/ppc/8xx_io/uart.c
index 1816df9ba..4bb555c77 100644
--- a/arch/ppc/8xx_io/uart.c
+++ b/arch/ppc/8xx_io/uart.c
@@ -1826,7 +1826,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
 				   serial_inp(info, UART_MCR) |
 				   (UART_MCR_DTR | UART_MCR_RTS));
 		sti();
-		current->state = TASK_INTERRUPTIBLE;
+		set_current_state(TASK_INTERRUPTIBLE);
 		if (tty_hung_up_p(filp) ||
 		    !(info->flags & ASYNC_INITIALIZED)) {
 #ifdef SERIAL_DO_RESTART
@@ -2243,7 +2243,7 @@ static struct console sercons = {
 /*
  *	Register console.
  */
-__initfunc (long console_8xx_init(long kmem_start, long kmem_end))
+long __init console_8xx_init(long kmem_start, long kmem_end)
 {
 	register_console(&sercons);
 	return kmem_start;
@@ -2254,7 +2254,7 @@ __initfunc (long console_8xx_init(long kmem_start, long kmem_end))
 /*
  * The serial driver boot-time initialization code!
  */
-__initfunc(int rs_8xx_init(void))
+int __init rs_8xx_init(void)
 {
 	struct serial_state * state;
 	ser_info_t	*info;
@@ -2596,7 +2596,7 @@ __initfunc(int rs_8xx_init(void))
 /* This must always be called before the rs_8xx_init() function, otherwise
  * it blows away the port control information.
 */
-__initfunc(static int serial_console_setup(struct console *co, char *options))
+static int __init serial_console_setup(struct console *co, char *options)
 {
 	struct		serial_state *ser;
 	uint		mem_addr, dp_addr;