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

diff -urN linux-2.4.22-bk19/Documentation/Configure.help linux-2.4.22-bk20/Documentation/Configure.help
--- linux-2.4.22-bk19/Documentation/Configure.help	2003-09-17 03:05:10.000000000 -0700
+++ linux-2.4.22-bk20/Documentation/Configure.help	2003-09-17 03:05:26.000000000 -0700
@@ -16094,21 +16094,15 @@
   architectural foundations.
 
   In general, ReiserFS is as fast as ext2, but is very efficient with
-  large directories and small files.  Additional patches are needed
-  for NFS and quotas, please see <http://www.reiserfs.org/> for links.
+  large directories and small files.  It is much faster for writes,
+  and slightly slower for reads than ext2.  It is much faster than
+  ext3.  It will be obsoleted by Reiser4 in not too long, so keep
+  an eye on our website for when Reiser4 ships.
 
-  It is more easily extended to have features currently found in
-  database and keyword search systems than block allocation based file
-  systems are.  The next version will be so extended, and will support
-  plugins consistent with our motto ``It takes more than a license to
-  make source code open.''
+  Mount with the notail option if performance matters more to you than
+  saving space (the design flaw underlying this is fixed in reiser4).
 
-  Read <http://www.reiserfs.org/> to learn more about reiserfs.
-
-  Sponsored by Threshold Networks, Emusic.com, and Bigstorage.com.
-
-  If you like it, you can pay us to add new features to it that you
-  need, buy a support contract, or pay us to port it to another OS.
+  Read <http://www.namesys.com> to learn more about reiserfs.
 
 Enable extra Reiserfs consistency checks
 CONFIG_REISERFS_CHECK
diff -urN linux-2.4.22-bk19/Makefile linux-2.4.22-bk20/Makefile
--- linux-2.4.22-bk19/Makefile	2003-09-17 03:05:10.000000000 -0700
+++ linux-2.4.22-bk20/Makefile	2003-09-17 03:05:26.000000000 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 22
-EXTRAVERSION = -bk19
+EXTRAVERSION = -bk20
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.22-bk19/drivers/sound/ac97_codec.c linux-2.4.22-bk20/drivers/sound/ac97_codec.c
--- linux-2.4.22-bk19/drivers/sound/ac97_codec.c	2003-08-25 04:44:42.000000000 -0700
+++ linux-2.4.22-bk20/drivers/sound/ac97_codec.c	2003-09-17 03:05:38.000000000 -0700
@@ -1077,6 +1077,9 @@
 /* WM9711, WM9712 */
 static int wolfson_init11(struct ac97_codec * codec)
 {
+	/* stop pop's during suspend/resume */
+	codec->codec_write(codec, AC97_WM97XX_TEST, codec->codec_read(codec, AC97_WM97XX_TEST) & 0xffbf);
+
 	/* set out3 volume */
 	codec->codec_write(codec, AC97_WM9711_OUT3VOL, 0x0808);
 	return 0;
diff -urN linux-2.4.22-bk19/drivers/video/aty/atyfb_base.c linux-2.4.22-bk20/drivers/video/aty/atyfb_base.c
--- linux-2.4.22-bk19/drivers/video/aty/atyfb_base.c	2003-09-17 03:05:21.000000000 -0700
+++ linux-2.4.22-bk20/drivers/video/aty/atyfb_base.c	2003-09-17 03:05:40.000000000 -0700
@@ -2481,6 +2481,8 @@
             info->frame_buffer = (unsigned long) addr + 0x800000UL;
             info->frame_buffer_phys = addr + 0x800000UL;
 
+            aty_init_register_array(info);
+
             /*
              * Figure mmap addresses from PCI config space.
              * Split Framebuffer in big- and little-endian halfs.
@@ -2671,6 +2673,7 @@
 
                 default_var.pixclock = 1000000000 / T;
             }
+
 #else /* __sparc__ */
 
             aux_app = 0;
diff -urN linux-2.4.22-bk19/drivers/video/aty/mach64_ct.c linux-2.4.22-bk20/drivers/video/aty/mach64_ct.c
--- linux-2.4.22-bk19/drivers/video/aty/mach64_ct.c	2003-09-17 03:05:21.000000000 -0700
+++ linux-2.4.22-bk20/drivers/video/aty/mach64_ct.c	2003-09-17 03:05:40.000000000 -0700
@@ -86,7 +86,7 @@
 
 u8 stdcall aty_ld_pll(int offset, const struct fb_info_aty *info)
 {
-    u32 addr;
+    unsigned long addr;
 
     addr = info->ati_regbase + CLOCK_CNTL + 1;
     /* write addr byte */
@@ -98,7 +98,7 @@
 
 static void stdcall aty_st_pll(int offset, u8 val, const struct fb_info_aty *info)
 {
-    u32 addr;
+    unsigned long addr;
     addr = info->ati_regbase + CLOCK_CNTL + 1;
     /* write addr byte */
     writeb((offset << 2) | PLL_WR_EN,addr);
