## Automatically generated incremental diff
## From:   linux-2.4.27-rc5
## To:     linux-2.4.27-rc6
## Robot:  $Id: make-incremental-diff,v 1.12 2004/01/06 07:19:36 hpa Exp $

diff -urN linux-2.4.27-rc5/Makefile linux-2.4.27-rc6/Makefile
--- linux-2.4.27-rc5/Makefile	2004-08-07 13:19:23.048693160 -0700
+++ linux-2.4.27-rc6/Makefile	2004-08-07 13:19:26.899851537 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 27
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.27-rc5/drivers/macintosh/nvram.c linux-2.4.27-rc6/drivers/macintosh/nvram.c
--- linux-2.4.27-rc5/drivers/macintosh/nvram.c	2004-08-07 13:19:23.402707719 -0700
+++ linux-2.4.27-rc6/drivers/macintosh/nvram.c	2004-08-07 13:19:27.701884520 -0700
@@ -37,7 +37,7 @@
 static ssize_t read_nvram(struct file *file, char *buf,
 			  size_t count, loff_t *ppos)
 {
-	loff_t n = *ppos
+	loff_t n = *ppos;
 	unsigned int i = n;
 	char *p = buf;
 
diff -urN linux-2.4.27-rc5/net/atm/br2684.c linux-2.4.27-rc6/net/atm/br2684.c
--- linux-2.4.27-rc5/net/atm/br2684.c	2004-08-07 13:19:24.205740743 -0700
+++ linux-2.4.27-rc6/net/atm/br2684.c	2004-08-07 13:19:29.311950733 -0700
@@ -736,8 +736,9 @@
 {
 	unsigned long page;
 	int len = 0, x, left;
-	page = get_free_page(GFP_KERNEL);
 	loff_t n = *pos;
+
+	page = get_free_page(GFP_KERNEL);
 	if (!page)
 		return -ENOMEM;
 	left = PAGE_SIZE - 256;
