2.6.17-git12 refresh

5 files changed, 14 insertions, 26 deletions

diff --git a/pci/64bit-resource-c99-changes-for-struct-resource-declarations.patch b/pci/64bit-resource-c99-changes-for-struct-resource-declarations.patch
index 2b85722e1913b..21632a3d04d8c 100644
--- a/pci/64bit-resource-c99-changes-for-struct-resource-declarations.patch
+++ b/pci/64bit-resource-c99-changes-for-struct-resource-declarations.patch
@@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #define lp0 io_res[0]
 --- gregkh-2.6.orig/drivers/video/console/vgacon.c
 +++ gregkh-2.6/drivers/video/console/vgacon.c
-@@ -389,7 +389,7 @@ static const char __init *vgacon_startup
+@@ -390,7 +390,7 @@ static const char *vgacon_startup(void)
  		vga_video_port_val = VGA_CRT_DM;
  		if ((ORIG_VIDEO_EGA_BX & 0xff) != 0x10) {
  			static struct resource ega_console_resource =
@@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			vga_video_type = VIDEO_TYPE_EGAM;
  			vga_vram_size = 0x8000;
  			display_desc = "EGA+";
-@@ -397,9 +397,9 @@ static const char __init *vgacon_startup
+@@ -398,9 +398,9 @@ static const char *vgacon_startup(void)
  					 &ega_console_resource);
  		} else {
  			static struct resource mda1_console_resource =
@@ -98,7 +98,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			vga_video_type = VIDEO_TYPE_MDA;
  			vga_vram_size = 0x2000;
  			display_desc = "*MDA";
-@@ -422,14 +422,14 @@ static const char __init *vgacon_startup
+@@ -423,14 +423,14 @@ static const char *vgacon_startup(void)
  
  			if (!ORIG_VIDEO_ISVGA) {
  				static struct resource ega_console_resource
@@ -115,7 +115,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  				vga_video_type = VIDEO_TYPE_VGAC;
  				display_desc = "VGA+";
  				request_resource(&ioport_resource,
-@@ -473,7 +473,7 @@ static const char __init *vgacon_startup
+@@ -474,7 +474,7 @@ static const char *vgacon_startup(void)
  			}
  		} else {
  			static struct resource cga_console_resource =
diff --git a/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch b/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch
index fd4081a1b85c8..7f8f8cc033c06 100644
--- a/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch
+++ b/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/arch/i386/Kconfig
 +++ gregkh-2.6/arch/i386/Kconfig
-@@ -516,6 +516,7 @@ config X86_PAE
+@@ -529,6 +529,7 @@ config X86_PAE
  	bool
  	depends on HIGHMEM64G
  	default y
diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-ide-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-ide-drivers.patch
index 10e9334fb2fd0..aace93fa9f052 100644
--- a/pci/64bit-resource-fix-up-printks-for-resources-in-ide-drivers.patch
+++ b/pci/64bit-resource-fix-up-printks-for-resources-in-ide-drivers.patch
@@ -69,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #ifdef CONFIG_PPC_PMAC
 --- gregkh-2.6.orig/drivers/ide/pci/pdc202xx_old.c
 +++ gregkh-2.6/drivers/ide/pci/pdc202xx_old.c
-@@ -580,8 +580,8 @@ static unsigned int __devinit init_chips
+@@ -544,8 +544,8 @@ static unsigned int __devinit init_chips
  	if (dev->resource[PCI_ROM_RESOURCE].start) {
  		pci_write_config_dword(dev, PCI_ROM_ADDRESS,
  			dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-mtd-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-mtd-drivers.patch
index 2747e74330d64..a745c7aeca871 100644
--- a/pci/64bit-resource-fix-up-printks-for-resources-in-mtd-drivers.patch
+++ b/pci/64bit-resource-fix-up-printks-for-resources-in-mtd-drivers.patch
@@ -16,8 +16,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/mtd/maps/amd76xrom.c       |    5 +++--
  drivers/mtd/maps/ichxrom.c         |    5 +++--
  drivers/mtd/maps/scx200_docflash.c |    5 +++--
- drivers/mtd/maps/sun_uflash.c      |   10 ++++++----
- 5 files changed, 19 insertions(+), 14 deletions(-)
+ drivers/mtd/maps/sun_uflash.c      |    5 +++--
+ 5 files changed, 16 insertions(+), 12 deletions(-)
 
 --- gregkh-2.6.orig/drivers/mtd/devices/pmc551.c
 +++ gregkh-2.6/drivers/mtd/devices/pmc551.c
@@ -92,28 +92,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if (width == 8)
 --- gregkh-2.6.orig/drivers/mtd/maps/sun_uflash.c
 +++ gregkh-2.6/drivers/mtd/maps/sun_uflash.c
-@@ -74,9 +74,10 @@ int uflash_devinit(struct linux_ebus_dev
+@@ -62,9 +62,10 @@ int uflash_devinit(struct linux_ebus_dev
  		/* Non-CFI userflash device-- once I find one we
  		 * can work on supporting it.
  		 */
 -		printk("%s: unsupported device at 0x%lx (%d regs): " \
 +		printk("%s: unsupported device at 0x%llx (%d regs): " \
  			"email ebrower@usa.net\n",
--			UFLASH_DEVNAME, edev->resource[0].start, nregs);
-+			UFLASH_DEVNAME,
-+			(unsigned long long)edev->resource[0].start, nregs);
+-		       dp->full_name, res->start, edev->num_addrs);
++		       dp->full_name, (unsigned long long)res->start,
++		       edev->num_addrs);
+ 
  		return -ENODEV;
  	}
- 
-@@ -132,8 +133,9 @@ static int __init uflash_init(void)
- 		for_each_ebusdev(edev, ebus) {
- 			if (!strcmp(edev->prom_name, UFLASH_OBPNAME)) {
- 				if(0 > prom_getproplen(edev->prom_node, "user")) {
--					DEBUG(2, "%s: ignoring device at 0x%lx\n",
--							UFLASH_DEVNAME, edev->resource[0].start);
-+					DEBUG(2, "%s: ignoring device at 0x%llx\n",
-+						UFLASH_DEVNAME,
-+						(unsigned long long)edev->resource[0].start);
- 				} else {
- 					uflash_devinit(edev);
- 				}
diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-video-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-video-drivers.patch
index 9cc4abdfcffa6..6aa7be58ec78e 100644
--- a/pci/64bit-resource-fix-up-printks-for-resources-in-video-drivers.patch
+++ b/pci/64bit-resource-fix-up-printks-for-resources-in-video-drivers.patch
@@ -100,7 +100,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	spin_lock_init(&dev->slock);
 --- gregkh-2.6.orig/drivers/media/video/cx88/cx88-video.c
 +++ gregkh-2.6/drivers/media/video/cx88/cx88-video.c
-@@ -1849,9 +1849,9 @@ static int __devinit cx8800_initdev(stru
+@@ -1847,9 +1847,9 @@ static int __devinit cx8800_initdev(stru
  	pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);
  	pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);
  	printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "