## Automatically generated incremental diff
## From:   linux-2.4.22-bk16
## To:     linux-2.4.22-bk17
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.4.22-bk16/Makefile linux-2.4.22-bk17/Makefile
--- linux-2.4.22-bk16/Makefile	2003-09-14 03:03:38.000000000 -0700
+++ linux-2.4.22-bk17/Makefile	2003-09-14 03:03:57.000000000 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 22
-EXTRAVERSION = -bk16
+EXTRAVERSION = -bk17
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.22-bk16/drivers/video/aty/atyfb_base.c linux-2.4.22-bk17/drivers/video/aty/atyfb_base.c
--- linux-2.4.22-bk16/drivers/video/aty/atyfb_base.c	2003-09-14 03:03:50.000000000 -0700
+++ linux-2.4.22-bk17/drivers/video/aty/atyfb_base.c	2003-09-14 03:04:25.000000000 -0700
@@ -313,7 +313,7 @@
     int pll, mclk, xclk;
     u32 features;
 } aty_chips[] __initdata = {
-    /* Note to kernel maintainers: Please resfuse any patch to change a clock rate,
+    /* Note to kernel maintainers: Please REFUSE any patch to change a clock rate,
        unless someone proves that a value is incorrect for him with a dump of
        the driver information table in the BIOS. Patches accepted in the past have
        caused chips to be overclocked by as much as 50%!
@@ -498,10 +498,12 @@
      * off. It is a Rage Mobility M1, but doesn't happen on these chips
      * in general. (Daniel Mantione, 26 june 2003)
      */
-      aty_st_lcd(aty_ld_lcd(LCD_GEN_CTRL, info) | SHADOW_RW_EN, info);
+      aty_st_lcd(LCD_GEN_CTRL, aty_ld_lcd(LCD_GEN_CTRL, info) | SHADOW_RW_EN,
+		 info);
       aty_st_le32(CRTC_H_TOTAL_DISP, crtc->h_tot_disp, info);
       aty_st_le32(CRTC_H_SYNC_STRT_WID, crtc->h_sync_strt_wid, info);
-      aty_st_lcd(aty_ld_lcd(LCD_GEN_CTRL, info) & ~SHADOW_RW_EN, info);
+      aty_st_lcd(LCD_GEN_CTRL, aty_ld_lcd(LCD_GEN_CTRL, info) & ~SHADOW_RW_EN,
+		 info);
     /* End hack */
 #endif
 
diff -urN linux-2.4.22-bk16/net/ipv4/netfilter/ip_nat_amanda.c linux-2.4.22-bk17/net/ipv4/netfilter/ip_nat_amanda.c
--- linux-2.4.22-bk16/net/ipv4/netfilter/ip_nat_amanda.c	2003-08-25 04:44:44.000000000 -0700
+++ linux-2.4.22-bk17/net/ipv4/netfilter/ip_nat_amanda.c	2003-09-14 03:04:26.000000000 -0700
@@ -101,7 +101,7 @@
 	struct ip_conntrack_expect *exp = expect;
 	struct ip_ct_amanda_expect *ct_amanda_info = &exp->help.exp_amanda_info;
 	struct ip_conntrack_tuple t = exp->tuple;
-	int port;
+	u_int16_t port;
 
 	MUST_BE_LOCKED(&ip_amanda_lock);
 
@@ -115,7 +115,7 @@
 	   writable */
 
 	t.dst.ip = newip;
-	for (port = ct_amanda_info->port + 10; port != 0; port++) {
+	for (port = ct_amanda_info->port; port != 0; port++) {
 		t.dst.u.tcp.port = htons(port);
 		if (ip_conntrack_change_expect(exp, &t) == 0)
 			break;
diff -urN linux-2.4.22-bk16/net/ipv4/netfilter/ip_nat_irc.c linux-2.4.22-bk17/net/ipv4/netfilter/ip_nat_irc.c
--- linux-2.4.22-bk16/net/ipv4/netfilter/ip_nat_irc.c	2003-08-25 04:44:44.000000000 -0700
+++ linux-2.4.22-bk17/net/ipv4/netfilter/ip_nat_irc.c	2003-09-14 03:04:26.000000000 -0700
@@ -99,7 +99,7 @@
 	struct ip_conntrack_tuple t;
 	struct iphdr *iph = (*pskb)->nh.iph;
 	struct tcphdr *tcph = (void *) iph + iph->ihl * 4;
-	int port;
+	u_int16_t port;
 
 	/* "4294967296 65635 " */
 	char buffer[18];
