[parisc-linux] Merge -rc1 -rc2 (was 2.4.19-rc1-ac6 Merge pa55: #error ...?)

[joel.soete@freebel.net]

Quoting Alan Cox <alan@lxorguk.ukuu.org.uk>:

> On Wed, 2002-07-17 at 18:37, joel.soete@freebel.net wrote:
> > Hi,
> > 
> > I merge my 19-rc1 stuff with 19-rc2 and just enounter a conflict in
> > include/linux/personality.h:
> > 
> > enum{
> > ...
> > +        PER_OSF4= 0x000f,
> > 
> > unfortunaltely the same as our:
> >          PER_HPUX= 0x000f,
> > 
> > What should I do?
> 
> I've asked Marcelo to use 0x0010 for OSF4 (its just added and not an
> established constant)
> 

And all my stuf compiles and run well at least on my b2k and 712.
Compile with gcc-3.0.4 and for gcc-3.2 I do have to apply following small patch:

--- aic7xxx_osm.c.orig	Thu Jul 18 15:22:10 2002
+++ aic7xxx_osm.c	Thu Jul 18 14:08:02 2002
@@ -417,25 +417,25 @@
 MODULE_LICENSE("Dual BSD/GPL");
 #endif
 MODULE_PARM(aic7xxx, "s");
-MODULE_PARM_DESC(aic7xxx, "period delimited, options string.
-
verbose
		Enable verbose/diagnostic logging
-
no_probe
	Disable EISA/VLB controller probing
-
no_reset
	Supress initial bus resets
-
extended
	Enable extended geometry on all controllers
-
periodic_otag
	Send an ordered tagged transaction periodically
-
			to prevent tag starvation.  This may be
-
			required by some older disk drives/RAID arrays. 
-
reverse_scan
	Sort PCI devices highest Bus/Slot to lowest
-
tag_info:<tag_str>
Set per-target tag depth
-
seltime:<int>
	Selection Timeout(0/256ms,1/128ms,2/64ms,3/32ms)
-
-
Sample /etc/modules.conf line:
-
	Enable verbose logging
-
	Disable EISA/VLB probing
-
	Set tag depth on Controller 2/Target 2 to 10 tags
-
	Shorten the selection timeout to 128ms from its default of 256
-
-
options aic7xxx='\"verbose.no_probe.tag_info:{{}.{}.{..10}}.seltime:1\"'
+MODULE_PARM_DESC(aic7xxx, "period delimited, options string.\n\
+
verbose
		Enable verbose/diagnostic logging\n\
+
no_probe
	Disable EISA/VLB controller probing\n\
+
no_reset
	Supress initial bus resets\n\
+
extended
	Enable extended geometry on all controllers\n\
+
periodic_otag
	Send an ordered tagged transaction periodically\n\
+
			to prevent tag starvation.  This may be\n\
+
			required by some older disk drives/RAID arrays. \n\
+
reverse_scan
	Sort PCI devices highest Bus/Slot to lowest\n\
+
tag_info:<tag_str>
Set per-target tag depth\n\
+
seltime:<int>
	Selection Timeout(0/256ms,1/128ms,2/64ms,3/32ms)\n\
+\n\
+
Sample /etc/modules.conf line:\n\
+
	Enable verbose logging\n\
+
	Disable EISA/VLB probing\n\
+
	Set tag depth on Controller 2/Target 2 to 10 tags\n\
+
	Shorten the selection timeout to 128ms from its default of 256\n\
+\n\
+
options aic7xxx='\"verbose.no_probe.tag_info:{{}.{}.{..10}}.seltime:1\"'\n\
 ");
 #endif
 
Many thanks again,
    Joel


-------------------------------------------------
This mail sent through Tiscali Webmail (http://webmail.tiscali.be)