[patch] Fix ia64 UPF_RESOURCES pcdp.c 2.6.7-mm5 build

[patch] Fix ia64 UPF_RESOURCES pcdp.c 2.6.7-mm5 build

[Paul Jackson]

It looks like someone removed UPF_RESOURCES in remove-upf_resources.patch
in parallel with someone adding drivers/firmware/pcdp.c that references
UPF_RESOURCES.

In any event, trying to build a defconfig ia64 2.6.7-mm5 (which includes
CONFIG_SERIAL_8250=y in the .config) fails with:

================  CC      drivers/firmware/pcdp.o
drivers/firmware/pcdp.c: In function `setup_serial_console':
drivers/firmware/pcdp.c:100: error: `UPF_RESOURCES' undeclared (first use in this function)
================
The following patch fixes this build error.

Someone with a certified clue needs to sign off on this.
I'm just typing blindly.

Signed-off-by: Paul Jackson <pj@sgi.com>

Index: 267mm5cpusetv4ia64/drivers/firmware/pcdp.c
=================================--- 267mm5cpusetv4ia64.orig/drivers/firmware/pcdp.c	2004-07-03 16:52:20.000000000 -0700
+++ 267mm5cpusetv4ia64/drivers/firmware/pcdp.c	2004-07-03 16:52:34.000000000 -0700
@@ -97,7 +97,7 @@ setup_serial_console(int rev, struct pcd
 		default:  port.type = PORT_UNKNOWN; break;
 	}
 
-	port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF | UPF_RESOURCES;
+	port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
 
 	if (uart_irq_supported(rev, uart)) {
 		port.irq = acpi_register_gsi(uart->gsi,

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373

Re: [patch] Fix ia64 UPF_RESOURCES pcdp.c 2.6.7-mm5 build

[Russell King]

On Sat, Jul 03, 2004 at 07:19:06PM -0700, Paul Jackson wrote:
> It looks like someone removed UPF_RESOURCES in remove-upf_resources.patch
> in parallel with someone adding drivers/firmware/pcdp.c that references
> UPF_RESOURCES.

Your patch is correct.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
                 2.6 Serial core