AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:
CFG:
PT:0
S:andy.sharp@lsi.com
RQ:
SSV:mhbs.lsil.com
NSV:
SSH:
R:<bill.fisher@lsi.com>,<rendell.fong@lsi.com>
MAID:2
X-Sylpheed-Privacy-System:
X-Sylpheed-Sign:0
SCF:#mh/Mailbox/sent
X-Sylpheed-End-Special-Headers: 1
Date: Wed, 4 Nov 2009 14:53:15 -0800
From: Andrew Sharp <andy.sharp@lsi.com>
To: Bill Fisher <bill.fisher@lsi.com>, Rendell Fong <rendell.fong@lsi.com>
Subject: changelist in -- short followon cl needed
Message-ID: <20091104145315.559ec6b8@ripper.onstor.net>
Organization: LSI
X-Mailer: Sylpheed-Claws 2.6.0 (GTK+ 2.8.20; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Because several files in my changelist were "integrates" (renames), a
touch-up follow on cl needs to go in to make changes to them now that
they're moved.  They're all in the nature of tuxrx->tuxstor.  I include
the diff for easy of review

Change 33728 by andys@ripper on 2009/11/04 14:18:11 *pending*

        Touch up changes after "integrating" (renaming) some files.

        Catch some deletes in the defunct arch/mips/onstor/tuxrx directory
        that were missed in 33727.

        reviewed by

Affected files ...

... //depot/tuxrx/linux/kernel/linux-mips-2.6/arch/mips/onstor/tuxrx/Makefile#1 delete
... //depot/tuxrx/linux/kernel/linux-mips-2.6/arch/mips/onstor/tuxrx/prom.c#1 delete
... //depot/tuxrx/linux/kernel/linux-mips-2.6/arch/mips/onstor/tuxrx/time.c#1 delete
... //depot/tuxrx/linux/kernel/linux-mips-2.6/arch/mips/onstor/tuxstor/prom.c#1 edit
... //depot/tuxrx/linux/kernel/linux-mips-2.6/arch/mips/onstor/tuxstor/setup.c#1 edit
... //depot/tuxrx/linux/kernel/linux-mips-2.6/tuxstor-config#1 edit
... //depot/tuxrx/linux/kernel/linux-mips-2.6/tuxstor-debug-config#1 edit



==== //depot/tuxrx/linux/kernel/linux-mips-2.6/arch/mips/onstor/tuxstor/setup.c#1 - /homes/andys/src/tuxrx/linux/kernel/linux-mips-2.6/arch/mips/onstor/tuxstor/setup.c ====
43c43
< #include <tuxrx.h>
---
> #include <tuxstor.h>
158c158
<              "TuxRx Processor"
---
>              "TuxStor System"
==== //depot/tuxrx/linux/kernel/linux-mips-2.6/arch/mips/onstor/tuxstor/prom.c#1 - /homes/andys/src/tuxrx/linux/kernel/linux-mips-2.6/arch/mips/onstor/tuxstor/prom.c ====
252c252
<       mips_machtype = MACH_ONSTOR_TUXRX;
---
>       mips_machtype = MACH_ONSTOR_TUXSTOR;
==== //depot/tuxrx/linux/kernel/linux-mips-2.6/tuxstor-config#1 - /homes/andys/src/tuxrx/linux/kernel/linux-mips-2.6/tuxstor-config ====
28c28
< CONFIG_ONSTOR_TUXRX=y
---
> CONFIG_ONSTOR_TUXSTOR=y
317c317
< CONFIG_TUXRX_ACPU=m
---
> CONFIG_ONSTOR_TUXSTOR_ACPU=m
1225c1225
< CONFIG_CMDLINE="console=duart0,57600n8 root=/dev/nfs nfsroot=10.0.0.143:/var/nfsroot/rendellf-tuxrx,v3,tcp ip=10.3.6.61:10.0.0.143:10.3.0.1:255.255.0.0:rf-tuxrx:eth0:none -s"
---
> CONFIG_CMDLINE="console=duart0,57600n8 root=/dev/nfs nfsroot=10.269.269.269:/var/nfsroot/rootsRus,v3,tcp ip=10.269.269.2691:10.269.269.269:10.3.0.1:255.255.0.0:yo-filer:eth0:none -s"
==== //depot/tuxrx/linux/kernel/linux-mips-2.6/tuxstor-debug-config#1 - /homes/andys/src/tuxrx/linux/kernel/linux-mips-2.6/tuxstor-debug-config ====
28c28
< CONFIG_ONSTOR_TUXRX=y
---
> CONFIG_ONSTOR_TUXSTOR=y
320c320
< CONFIG_TUXRX_ACPU=m
---
> CONFIG_ONSTOR_TUXSTOR_ACPU=m

