[TRIVIAL] PATCH 2.5: kconfig sychronise banners (2_16)

[TRIVIAL] PATCH 2.5: kconfig sychronise banners (2_16)

[Rusty Trivial Russell]

From:  Greg Banks <gnb@alphalink.com.au>

(Included in 2.5)
  G'day,
  
  
  2/5 definitions of CONFIG_BLK_DEV_SR have trivially different banners.
  

--- trivial-2.4.20-pre1/arch/m68k/config.in.orig	2002-08-07 10:57:32.000000000 +1000
+++ trivial-2.4.20-pre1/arch/m68k/config.in	2002-08-07 10:57:32.000000000 +1000
@@ -205,7 +205,7 @@
    if [ "$CONFIG_CHR_DEV_ST" != "n" ]; then
       int  'Maximum number of SCSI tapes that can be loaded as modules' CONFIG_ST_EXTRA_DEVS 2
    fi
-   dep_tristate '  SCSI CD-ROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI
+   dep_tristate '  SCSI CDROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI
    if [ "$CONFIG_BLK_DEV_SR" != "n" ]; then
       bool '    Enable vendor-specific extensions (for SCSI CDROM)' CONFIG_BLK_DEV_SR_VENDOR
       int  'Maximum number of CDROM devices that can be loaded as modules' CONFIG_SR_EXTRA_DEVS 2
--- trivial-2.4.20-pre1/drivers/scsi/Config.in.orig	2002-08-07 10:57:32.000000000 +1000
+++ trivial-2.4.20-pre1/drivers/scsi/Config.in	2002-08-07 10:57:32.000000000 +1000
@@ -10,7 +10,7 @@
 
 dep_tristate '  SCSI OnStream SC-x0 tape support' CONFIG_CHR_DEV_OSST $CONFIG_SCSI
 
-dep_tristate '  SCSI CD-ROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI
+dep_tristate '  SCSI CDROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI
 
 if [ "$CONFIG_BLK_DEV_SR" != "n" ]; then
    bool '    Enable vendor-specific extensions (for SCSI CDROM)' CONFIG_BLK_DEV_SR_VENDOR
-- 
  Don't blame me: the Monkey is driving

Re: [TRIVIAL] PATCH 2.5: kconfig sychronise banners (2_16)

[Alan Cox]

On Wed, 2002-08-07 at 05:06, Rusty Trivial Russell wrote:
> From:  Greg Banks <gnb@alphalink.com.au>
> 
> (Included in 2.5)
>   G'day,
>   
>   
>   2/5 definitions of CONFIG_BLK_DEV_SR have trivially different banners.

2.5 is wrong, 2.4 is right. At least according to Philips who invented
the things. Please submit the reverse diff to 2.5 8)

Re: [TRIVIAL] PATCH 2.5: kconfig sychronise banners (2_16)

[Rusty Russell]

In message <1028720141.18478.244.camel@irongate.swansea.linux.org.uk> you write
:
> On Wed, 2002-08-07 at 05:06, Rusty Trivial Russell wrote:
> > From:  Greg Banks <gnb@alphalink.com.au>
> > 
> > (Included in 2.5)
> >   G'day,
> >   
> >   
> >   2/5 definitions of CONFIG_BLK_DEV_SR have trivially different banners.
> 
> 2.5 is wrong, 2.4 is right. At least according to Philips who invented
> the things. Please submit the reverse diff to 2.5 8)

<SIGH>
	CDROM seems pretty prevelent in the kernel over CD-ROM.
Unification of the banners is a trivial first step to furthur removal
of things that are gratuitously arch-dependent: this wasn't primarily
a spelling fix.

s/CDROM/CD-ROM/ would probably come under the new "too trivial for
trivial patch monkey rule" in normal circumstances 8)

Rusty.
--
  Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

Re: [TRIVIAL] PATCH 2.5: kconfig sychronise banners (2_16)

[Greg Banks]

Rusty Russell wrote:
> 
> In message <1028720141.18478.244.camel@irongate.swansea.linux.org.uk> you write
> :
> > On Wed, 2002-08-07 at 05:06, Rusty Trivial Russell wrote:
> > > From:  Greg Banks <gnb@alphalink.com.au>
> > >
> > >   2/5 definitions of CONFIG_BLK_DEV_SR have trivially different banners.
> >
> > 2.5 is wrong, 2.4 is right. At least according to Philips who invented
> > the things. Please submit the reverse diff to 2.5 8)
> 
> <SIGH>
>         CDROM seems pretty prevelent in the kernel over CD-ROM.

I counted them in 2.5 when I rolled this patch, it was CDROM 39, CD-ROM 15.

> Unification of the banners is a trivial first step to furthur removal
> of things that are gratuitously arch-dependent: this wasn't primarily
> a spelling fix.

Exactly.  CONFIG_BLK_DEV_SR was defined in 5 places, 3 of which spelled
it the wrong way; I chose to change the 2 correct spellings only because
that was a smaller diff.  The actual spelling in the corpus doesn't bother
me at all.

> s/CDROM/CD-ROM/ would probably come under the new "too trivial for
> trivial patch monkey rule" in normal circumstances 8)

I'm willing to do the changes if someone credible will send them to Linus
and Marcello.

Greg.
-- 
the price of civilisation today is a courageous willingness to prevail,
with force, if necessary, against whatever vicious and uncomprehending
enemies try to strike it down.     - Roger Sandall, The Age, 28Sep2001.