* [U-Boot-Users] PPC 405 _start code - Clarification
From: Wolfgang Denk @ 2002-12-14 19:36 UTC (permalink / raw)
To: u-boot
In-Reply-To: <EGEGIJHKDKJGAJMGIDPNOEHHCCAA.jwalden@digitalatlantic.com>
In message <EGEGIJHKDKJGAJMGIDPNOEHHCCAA.jwalden@digitalatlantic.com> you wrote:
>
> what I expect to see it what I see in /cpu/start.S which looks like:
>
> .text
> .long 0x27051956 /* U-Boot Magic Number */
> .globl version_string
> version_string:
> .ascii U_BOOT_VERSION
> .ascii " (", __DATE__, " - ", __TIME__, ")"
> .ascii CONFIG_IDENT_STRING, "\0"
Let's ignore this part for now - you should find it at offset 0x0000.
_start is at offset 0x0100:
> _start:
...
> addi r4,r0,0x0000
> mtspr sgr,r4
> mtspr dcwr,r4
>
>
> Instead I see:
>
> fff80100 <_start>:
> fff80100: 38 80 00 00 li r4,0
> fff80104: 7c 99 eb a6 mtsgr r4
> fff80108: 7c 9a eb a6 mtdcwr r4
> fff8010c: 7c 94 f3 a6 mtesr r4
> fff80110: 7c 9a f3 a6 mttcr r4
> fff80114: 7c 81 03 a6 mtxer r4
> fff80118: 7c 96 f3 a6 mtevpr r4
> fff8011c: 38 80 10 00 li r4,4096
>
> So hence I am confused....
You confuse me. Why are you confused?
"addi r4,r0,0x0000" == "li r4,0"
"mtspr sgr,r4" == "mtsgr r4"
"mtspr dcwr,r4" == "mtdcwr r4"
...
Looks identical to me.
Best regards,
Wolfgang Denk
--
Software Engineering: Embedded and Realtime Systems, Embedded Linux
Phone: (+49)-8142-4596-87 Fax: (+49)-8142-4596-88 Email: wd at denx.de
You don't have to stay up nights to succeed; you have to stay awake
days.
^ permalink raw reply
* Re: [PATCH] kexec for 2.5.51....
From: Eric W. Biederman @ 2002-12-14 19:37 UTC (permalink / raw)
To: Ed Tomlinson; +Cc: linux-kernel
In-Reply-To: <200212141215.49449.tomlins@cam.org>
Ed Tomlinson <tomlins@cam.org> writes:
> Eric W. Biederman wrote:
>
> > Linus,
> >
> > My apologies for not resending this earlier I've been terribly
> > busy with other things..
> >
> > No changes are included since the last time I sent this except
> > the diff now patches cleanly onto 2.5.51. If there is some problem
> > holler and I will see about fixing it.
> >
> > When I bypass the BIOS in booting clients my only current failure
> > report is on an IBM NUMAQ and that almost worked.
>
> I applied this to a 2.5.51 kernel with usb and fbcon updated via bk pulls.
> Then after rebooting into the new kernel I tried
>
> kexec -l /vmlinux.25 --append="console=tty0 console=ttyS0,38400
> video=matrox:mem:32 idebus=33 profile=1"
>
> kexec -ed
>
> This rebooted but hangs at:
>
> drivers/usb/host/uhci-hcd.c: USB Universal Host Controller Interface driver v2.0
>
Hurray! a bug report :)
> One other datum. Without the --append line a kernel booted with kexec hangs
> when
>
> tring to mount the real root - it cannot find the device.
I suspect you want to specify --append="root=/dev/xyz" when calling kexec.
> Am I using kexec correctly? What else can I try? Is there any debug
> info I can gather?
Generally you want to put kexec -e your shutdown scripts just before
the call to reboot. And then you can just say: kexec ...
and the you get a clean system shutdown. Dropping to run level 1
before calling kexec tends to get most of the user space shutdown
called as well. It is definitely a good idea to be certain X is
shutdown before calling kexec.
With respect to USB it is quite possible something in the USB drivers
does not shutdown correctly on a reboot, and the driver then has trouble
reinitializing the device.
Since you got to the point of mounting root earlier when you did not
specify anything I wonder if you some of your command line arguments
made the situation worse.
Which kernel are you booting with kexec anyway?
This is actually an expected failure mode, but one I have not seen
much of yet. The new kernel not coming up because the old drivers
left the hardware in a state the new drivers cannot handle.
Eric
^ permalink raw reply
* [PATCH] Obvious: parport_serial depends on PCI.
From: Matthew Bell @ 2002-12-14 19:36 UTC (permalink / raw)
To: Philip.Blundell, linux-parport, marcelo, linux-kernel
This is valid for 2.4.20 and earlier at the least; just annoying and pedantic really...
--- linux.orig/drivers/parport/Config.in 2001-12-21 17:41:55.000000000 +0000
+++ linux/drivers/parport/Config.in 2002-08-06 18:52:21.000000000 +0100
@@ -17,7 +17,7 @@
else
define_tristate CONFIG_PARPORT_PC_CML1 $CONFIG_PARPORT_PC
fi
- dep_tristate ' Multi-IO cards (parallel and serial)' CONFIG_PARPORT_SERIAL $CONFIG_PARPORT_PC_CML1
+ dep_tristate ' Multi-IO cards (parallel and serial)' CONFIG_PARPORT_SERIAL $CONFIG_PARPORT_PC_CML1 $CONFIG_PCI
fi
if [ "$CONFIG_PARPORT_PC" != "n" ]; then
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
--
_______________________________________________
Get your free email from http://mymail.operamail.com
Powered by Outblaze
^ permalink raw reply
* Re: [BK][PATCH] ReiserFS CPU and memory bandwidth efficient large writes
From: Oleg Drokin @ 2002-12-14 19:20 UTC (permalink / raw)
To: Andrew Morton; +Cc: Hans Reiser, Linux Kernel Mailing List
In-Reply-To: <3DFB7B9E.FC404B6B@digeo.com>
Hello!
On Sat, Dec 14, 2002 at 10:42:38AM -0800, Andrew Morton wrote:
> > Find below the patch that address all the issues you've brought.
> > It is on top of previous one.
> > Do you think it is ok now?
> I addresses the things I noticed and raised, thanks. Except for the
> stack-space use. People are waving around 4k-stack patches, and we
> do need to be careful there.
Well, 450 bytes is way below 4k (~7 times less if we'd take task struct
into account) ;)
I can replace that on-stack array with kmalloc, but that probably
would be a lot of overhead for no benefit.
What do you think is safe stack usage limit for a function?
(and btw you have not even seen reiser4 stack usage ;) )
Bye,
Oleg
^ permalink raw reply
* Re: IDE-CD and VT8235 issue!!!
From: Patrick Petermair @ 2002-12-14 19:19 UTC (permalink / raw)
To: linux-kernel
In-Reply-To: <3DFB7B21.7040004@tin.it>
Hi!
Same problem here. I have addressed this issue several times...so far no
solution.
My specs:
MSI KT3 Ultra2 (VT8235)
TOSHIBA DVD-ROM SD-M1302
YAMAHA CRW8424E
Kernel 2.4.19:
The one I'm currently using. It doesn't detect the VT8235 and therefore
I have no dma. But I can access/mount my DVD without a problem.
Kernel 2.4.20:
Detects the VT8235 at boot but hangs with my DVD Rom (hdc) --> doesn't
boot. I have posted my problem here an Alan Cox suggested that I should
try the -ac tree.
Kernel 2.4.20-ac2:
Some improvements - It detects the VT8235 at boot, also my DVD and CDRW.
It boots fine and I have DMA on all my discs. But as soon as I try to
mount a CD/DVD (mount /cdrom) the system hangs and I get this:
hdc: status timeout: status=0xd1 { Busy }
hdc: status timeout: error=0x60LastFailedSense 0x06
hdc: DMA disabled
hdc: ATAPI reset timed-out, status=0x80
hdd: DMA disabled
ide1: reset: success
hdc: status timeout: status=0x80 { Busy }
hdc: status timeout: error=0x01IllegalLengthIndication
hdc: ATAPI reset timed-out, status=0xd1
ide1: reset: success
hdc: status timeout: status=0x80 { Busy }
hdc: status timeout: error=0x01IllegalLengthIndication
end_request: I/O error, dev 16:00 (hdc), sector 0
hdc: status timeout: status=0xd0 { Busy }
and so on...
My guess is the DVD-drive. I know many people with the same southbridge
(VT8235), who have dma since 2.4.20 an no problem at all at boot-time
or mounting a CD/DVD.
Any hints?
Patrick
^ permalink raw reply
* Re: [2.5.51] Failure to mount ext3 root when ext2 compiled in
From: Mohamed El Ayouty @ 2002-12-14 19:06 UTC (permalink / raw)
To: Andrew Morton; +Cc: Rusty Russell, LKML
In-Reply-To: <3DFB7D14.149B2B80@digeo.com>
I tried your suggestion to replace CONFIG_DEVFS_FS with
CONFIG_DEVFS_MOUNT in the code snippet:
#ifdef CONFIG_DEVFS_FS
sys_mount("devfs", "/dev", "devfs", 0, NULL);
do_devfs = 1;
#endif
But it gave me the same panic on boot.
Mohamed
^ permalink raw reply
* Re: 2.4.20-ac1 KT400 AGP support
From: Courtney Grimland @ 2002-12-14 19:15 UTC (permalink / raw)
To: Dave Jones; +Cc: linux-kernel
In-Reply-To: <20021214101327.GB30545@suse.de>
That's retarded. I guess I just got lucky with mine. In fact, now
that I can build a monolithic 2.4.x that supports my AGP and
8235 sound, I couldn't be happier with my Gigabyte 7VAXP.
On Sat, 14 Dec 2002 10:13:27 +0000
Dave Jones <davej@codemonkey.org.uk> wrote:
> Aparently some KT400 BIOS's got clever, and took away the option.
> They switch to AGP 3.0 if an AGP 3.0 card is present, and drop
> back to 2.0 if a 2.0 card is present.
^ permalink raw reply
* Re: [PATCH] Remove Rules.make from Makefiles (1/3)
From: Kai Germaschewski @ 2002-12-14 19:01 UTC (permalink / raw)
To: Brian Gerst; +Cc: Linus Torvalds, Linux-Kernel
In-Reply-To: <3DFB70D3.9010506@quark.didntduck.org>
On Sat, 14 Dec 2002, Brian Gerst wrote:
> Makefiles no longer need to include Rules.make, which is currently an
> empty file. This patch removes it from the arch tree Makefiles.
I was hoping somebody would do the legwork here ;) I agree with these
patches, I was just too lazy to do them myself yet. I'll pick them up if
Linus didn't apply them already.
Thanks,
--Kai
^ permalink raw reply
* Re: [2.5.51] Failure to mount ext3 root when ext2 compiled in
From: Andrew Morton @ 2002-12-14 18:48 UTC (permalink / raw)
To: Mohamed El Ayouty; +Cc: Rusty Russell, LKML
In-Reply-To: <1039875751.10805.3.camel@syKr0n.mine.nu>
Mohamed El Ayouty wrote:
>
> I started having that problem since 2.5.48.
>
> I just commented out those 4 lines in init/do_mounts.c:
>
> #ifdef CONFIG_DEVFS_FS
> sys_mount("devfs", "/dev", "devfs", 0, NULL);
> do_devfs = 1;
> #endif
>
> and 2.5.51 now works.
>
OK, the above code was added in 2.5.48. Thanks. I'll bug Mr Viro
about it when the power comes back on over on the East coast...
If you replace CONFIG_DEVFS_FS with CONFIG_DEVFS_MOUNT there, does
that fix it?
^ permalink raw reply
* Re: [BK][PATCH] ReiserFS CPU and memory bandwidth efficient large writes
From: Andrew Morton @ 2002-12-14 18:42 UTC (permalink / raw)
To: Oleg Drokin; +Cc: Hans Reiser, Linux Kernel Mailing List
In-Reply-To: <20021214162108.A3452@namesys.com>
Oleg Drokin wrote:
>
> Hello!
>
> On Fri, Dec 13, 2002 at 01:40:42PM -0800, Andrew Morton wrote:
>
> > This seems wrong. This could be a newly-allocated pagecache page. It is not
> > yet fully uptodate. If (say) the subsequent copy_from_user gets a fault then
> > it appears that this now-uptodate pagecache page will leak uninitialised stuff?
>
> Ok, after all I think we do not need this uptodate stuff at all.
Well that certainly simplifies things.
> Find below the patch that address all the issues you've brought.
> It is on top of previous one.
> Do you think it is ok now?
I addresses the things I noticed and raised, thanks. Except for the
stack-space use. People are waving around 4k-stack patches, and we
do need to be careful there.
^ permalink raw reply
* IDE-CD and VT8235 issue!!!
From: AnonimoVeneziano @ 2002-12-14 18:40 UTC (permalink / raw)
To: linux-kernel
Hi, I have this chip on a MSI KT4 Ultra (KT400 and VT8235) and an
Athlon 2400+.
I have noe the kernel 2.4.19 and all works fine, but 2.4.19 don't
support this chip (so no DMA & Co) and I've decided to upgrade to 2.4.20
to get it working.
I've compiled in the Debian Way ( kernel-package) and installed the
kernel, then I've rebooted it.
During the startup progress it have initialized the HDs fine , but when
he had reached the first CDROM ( a NEC DVD READER) it locked up with
this message:
hdc: DMA disabled
hdc: drive is not ready for command
ide1: reset: success!
and it repeats this messages in an infinite loop , I don't know how to
solve this , there isn't a patch or something else?
The kernel that I've tried (without success) are:
kernel 2.4.20 (original)
kernel 2.4.20 -ac2
kernel-source-2.4.20 package by debian + patches
kernel-2.5.50-ac1(doesen't boot)
kernel-2.5.53 (doesen't compiles)
Please help
Thank u
Byez
^ permalink raw reply
* Re: Intel P6 vs P7 system call performance
From: GrandMasterLee @ 2002-12-14 18:36 UTC (permalink / raw)
To: Dave Jones; +Cc: Mike Dresser, linux-kernel
In-Reply-To: <20021214100125.GA30545@suse.de>
On Sat, 2002-12-14 at 04:01, Dave Jones wrote:
> On Fri, Dec 13, 2002 at 11:53:51PM -0500, Mike Dresser wrote:
> > On Fri, 13 Dec 2002, Mike Dresser wrote:
> >
> > > The single P4/2.53 in another machine can haul down in 3m17s
> > >
> > Amend that to 2m19s, forgot to kill a background backup that was moving
> > files around at about 20 meg a second.
> Note that there are more factors at play than raw cpu speed in a
> kernel compile. Your time here is slightly faster than my 2.8Ghz P4-HT for
> example. My guess is you have faster disk(s) than I do, as most of
> the time mine seems to be waiting for something to do.
An easy way to level the playing field would be to use /dev/shm to build
your kernel in. That way it's all in memory. If you've got a maching
with 512M, then it's easily accomplished.
> *note also that this is compiling stock 2.4.20 with default configuration.
> The minute you change any options, we're comparings apples to oranges.
>
> Dave
^ permalink raw reply
* Re: JDIRTY JWAIT errors in 2.4.19
From: Tupshin Harper @ 2002-12-14 18:34 UTC (permalink / raw)
To: Oleg Drokin; +Cc: linux-kernel
In-Reply-To: <20021214135550.A13549@namesys.com>
Sigh...unfortunately that machine didn't have magic SysRq compiled in.
I'm going to build an idential kernel with Sysrq and reboot. Maybe I'll
see the error again in a month or so ;-(
-Tupshin
Oleg Drokin wrote:
>Can you please execute SysRq-T, decode it with ksymoops and send us the result?
>
>
>
Sigh...unfortunately that machine didn't have magic SysRq compiled in.
I'm going to build an identical kernel with Sysrq and reboot. Maybe I'll
see the error again in a month or so ;-(
-Tupshin
^ permalink raw reply
* 2.5.51 on Alpha oopses on mount
From: Matt Reppert @ 2002-12-14 18:31 UTC (permalink / raw)
To: linux-kernel; +Cc: rth
I'm trying to get a workable 2.5.51 (*eventually* with modules and everything)
on my Alpha test box. Right now whenever I try to boot and mount anything
(2.11-n from Debian testing) I get an oops and mount segfaults. FYI, I have
the following two changes to my tree to get it to compile (thanks to rth for
advice on the first):
diff -Nru a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h
+++ a/include/asm-alpha/pci.h
--- b/include/asm-alpha/pci.h
@@ -6,7 +6,6 @@
#include <linux/spinlock.h>
#include <asm/scatterlist.h>
#include <asm/machvec.h>
-#include <asm/io.h>
/*
diff -Nru a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
+++ a/drivers/scsi/sr_ioctl.c
--- b/drivers/scsi/sr_ioctl.c
@@ -3,6 +3,7 @@
#include <linux/mm.h>
#include <linux/fs.h>
#include <asm/uaccess.h>
+#include <asm/io.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/blk.h>
Here's the decoded oops.
ksymoops 2.4.6 on alpha 2.4.19-pre7-rmap13. Options used
-v /home/arashi/kernels/arashi-2.5/vmlinux (specified)
-K (specified)
-L (specified)
-O (specified)
-m /boot/System.map-2.5.51 (specified)
Unable to handle kernel paging request at virtual address 000000012002e000
mount(20): Oops 0
pc = [<fffffc00004a5240>] ra = [<fffffc00003850c0>] ps = 0000 Not tainted
Using defaults from ksymoops -t elf64-alpha -a alpha
v0 = 0000000000001300 t0 = 0000000000000000 t1 = 000000012002f300
t2 = 0000000000000000 t3 = 0000000000001300 t4 = fffffc0000664f30
t5 = fffffc000f914d00 t6 = 000000012002e000 t7 = fffffc000f8b0000
s0 = 000000012002d300 s1 = fffffc000f914000 s2 = fffffc000f8b3ef8
s3 = 000000012002d360 s4 = 00000000c0ed0000 s5 = 0000000120029b60
s6 = 000000012002d2a0
a0 = fffffc0000a6cb20 a1 = 0000000000000000 a2 = 0000000000002000
a3 = 00000000c0ed0000 a4 = 000000012002d360 a5 = 000000011ffffbd8
t8 = 0000000000002000 t9 = 0000020000144d40 t10= 0000000000000008
t11= 00000200001bda00 pv = fffffc00004a5140 at = fffffc0000385128
gp = fffffc000076c548 sp = fffffc000f8b3ea8
Trace:fffffc0000385920 fffffc0000313064 fffffc0000313064
Code: f41ffff5 c3e00013 e480000a 2ffe0000 47ff041f 2ffe0000 <a4270000> 40811524
>>RA; fffffc00003850c0 <copy_mount_options+40/140>
>>PC; fffffc00004a5240 <__copy_user+100/1d4> <=====
Trace; fffffc0000385920 <sys_mount+40/160>
Trace; fffffc0000313064 <entSys+a4/c0>
Trace; fffffc0000313064 <entSys+a4/c0>
Code; fffffc00004a5228 <__copy_user+e8/1d4>
0000000000000000 <_PC>:
Code; fffffc00004a5228 <__copy_user+e8/1d4>
0: f5 ff 1f f4 bne v0,ffffffffffffffd8 <_PC+0xffffffffffffffd8> fffffc00004a5200 <__copy_user+c0/1d4>
Code; fffffc00004a522c <__copy_user+ec/1d4>
4: 13 00 e0 c3 br 54 <_PC+0x54> fffffc00004a527c <__copy_user+13c/1d4>
Code; fffffc00004a5230 <__copy_user+f0/1d4>
8: 0a 00 80 e4 beq t3,34 <_PC+0x34> fffffc00004a525c <__copy_user+11c/1d4>
Code; fffffc00004a5234 <__copy_user+f4/1d4>
c: 00 00 fe 2f unop
Code; fffffc00004a5238 <__copy_user+f8/1d4>
10: 1f 04 ff 47 nop
Code; fffffc00004a523c <__copy_user+fc/1d4>
14: 00 00 fe 2f unop
Code; fffffc00004a5240 <__copy_user+100/1d4> <=====
18: 00 00 27 a4 ldq t0,0(t6) <=====
Code; fffffc00004a5244 <__copy_user+104/1d4>
1c: 24 15 81 40 subq t3,0x8,t3
Matt
^ permalink raw reply
* Re: 2.5.51 load avg += 1 (more info)
From: Roy Sigurd Karlsbakk @ 2002-12-14 18:28 UTC (permalink / raw)
To: Kernel mailing list
In-Reply-To: <200212141817.21202.roy@karlsbakk.net>
hi
just more info...
tonje:~# vmstat 3
procs -----------memory---------- ---swap-- -----io---- --system-- ----cpu----
r b swpd free buff cache si so bi bo in cs us sy id wa
0 0 0 40388 193024 180772 0 0 1 5 86 8 0 0 99 0
0 0 0 40388 193024 180772 0 0 0 0 1002 7 0 0 100 0
0 0 0 40388 193024 180772 0 0 0 24 1005 16 0 0 100 0
0 0 0 40388 193024 180772 0 0 0 0 1001 6 0 0 100 0
0 0 0 40388 193024 180772 0 0 0 0 1001 8 0 0 100 0
0 0 0 40252 193024 180772 0 0 0 15 1007 15 0 0 100 0
tonje:~# cat /proc/uptime && sleep 10 && cat /proc/uptime
374786.48 372940.50
374796.48 372950.50
tonje:~#
...rebooting machine...
roy@tonje:~$ uptime
18:25:23 up 4 min, 1 user, load average: 0.00, 0.02, 0.00
huh?
--
Roy Sigurd Karlsbakk, Datavaktmester
ProntoTV AS - http://www.pronto.tv/
Tel: +47 9801 3356
Computers are like air conditioners.
They stop working when you open Windows.
^ permalink raw reply
* Re: [BK][PATCH] ReiserFS CPU and memory bandwidth efficient large writes
From: Andrew Morton @ 2002-12-14 18:27 UTC (permalink / raw)
To: Oleg Drokin; +Cc: Hans Reiser, Linux Kernel Mailing List
In-Reply-To: <20021214144437.B13549@namesys.com>
Oleg Drokin wrote:
>
> > > + if ( from != 0 ) {/* First page needs to be partially zeroed */
> > > + char *kaddr = kmap_atomic(prepared_pages[0], KM_USER0);
> > > + memset(kaddr, 0, from);
> > > + kunmap_atomic( kaddr, KM_USER0);
> > > + SetPageUptodate(prepared_pages[0]);
> > > + }
> > > + if ( to != PAGE_CACHE_SIZE ) { /* Last page needs to be partially zeroed */
> > > + char *kaddr = kmap_atomic(prepared_pages[num_pages-1], KM_USER0);
> > > + memset(kaddr+to, 0, PAGE_CACHE_SIZE - to);
> > > + kunmap_atomic( kaddr, KM_USER0);
> > > + SetPageUptodate(prepared_pages[num_pages-1]);
> > > + }
> > This seems wrong. This could be a newly-allocated pagecache page. It is not
> > yet fully uptodate. If (say) the subsequent copy_from_user gets a fault then
> > it appears that this now-uptodate pagecache page will leak uninitialised stuff?
>
> No, I do not see it. Even if we have somebody already mmapped this part of file,
> and he got enough of luck that subsequent copy_from_user gets a fault and then
> this someone gets to CPU and tries to access the page, the SIGBUS should happen
> because of access to mmaped area beyond end of file as we have not yet updated
> the file size note that we have this check before this code you pointed out:
> if ( (pos & ~(PAGE_CACHE_SIZE - 1)) > inode->i_size ) {
>
It is not related to mmap. The exploit would be to pass a partially
(or fully?) invalid (address, length) pair into the write() system call.
Something like:
fd = creat(...);
write(fd, 0, 4095); /* efault, instantiate 0'th page */
lseek(fd, 4096, SEEK_SET);
write(fd, "", 1); /* place the 0'th page inside i_size */
lseek(fd, 0, SEEK_SET);
read(fd, my_buffer, 4095); /* now what do we have? */
^ permalink raw reply
* how to swap ctrl/caps lock keys for joe?
From: Jerry James Haumberger @ 2002-12-14 18:13 UTC (permalink / raw)
To: linux-newbie
Hi, Ray --
>I don't do this myself, but there is a standard set of tools for remapping
>the keyboard with Linux consoles. For the details (I can't say it any
>better than they do), check the Keyboard and Console HowTo, available at
>(for example):
> http://www.tldp.org/HOWTO/Keyboard-and-Console-HOWTO.html
Thank you for the reference, however, it was both a difficult and
simple task to find the solution. The difficult part was the problem
with finding the problem documented on the Internet, and then sift
through all of that with a fine-toothed comb.
To make the long problem simple, here's the solution for swapping
the left Control key and Caps Lock keys for greater ease of use
with WordStar control key combinations while under BasicLinux:
1. I got kbd.tgz from the Slackware 3.5 ftp site and extracted
us.map and loadkeys.
2. Next, I put us.map in /usr/lib/kbd/keytables/ .
3. Then I moved loadkeys to /usr/bin .
4. After that, I modified us.map to make "keycode 58 = Control"
(instead of 29) and "keycode 29 = Caps_Lock" (instead of 58).
5. Finally, I added "loadkeys us.map" at the bottom of my rc.S
file at /etc/rc.d/ and rebooted.
Done... and now, at last, I can easily have my WordStar Control key
functioning where it belongs -- and *anywhere* I use it! ;-)
__________________________________________________________
Jerry... on a 486 DX2-50MHz with 8MB RAM in BasicLinux 1.7
-
To unsubscribe from this list: send the line "unsubscribe linux-newbie" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.linux-learn.org/faqs
^ permalink raw reply
* [PATCH] Remove Rules.make from Makefiles (3/3)
From: Brian Gerst @ 2002-12-14 17:56 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux-Kernel, kai
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
Makefiles no longer need to include Rules.make, which is currently an
empty file. This patch removes it from the remaining Makefiles, and
removes the empty Rules.make file.
[-- Attachment #2: rules.make-other-1 --]
[-- Type: text/plain, Size: 48789 bytes --]
diff -urN linux-2.5.51-bk1/Rules.make linux/Rules.make
--- linux-2.5.51-bk1/Rules.make Sat Dec 14 12:31:47 2002
+++ linux/Rules.make Wed Dec 31 19:00:00 1969
@@ -1 +0,0 @@
-
diff -urN linux-2.5.51-bk1/crypto/Makefile linux/crypto/Makefile
--- linux-2.5.51-bk1/crypto/Makefile Sat Dec 14 12:32:10 2002
+++ linux/crypto/Makefile Sat Dec 14 12:38:56 2002
@@ -22,5 +22,3 @@
obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o
obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/Makefile linux/fs/Makefile
--- linux-2.5.51-bk1/fs/Makefile Sat Dec 14 12:32:05 2002
+++ linux/fs/Makefile Sat Dec 14 12:38:56 2002
@@ -94,5 +94,3 @@
obj-$(CONFIG_XFS_FS) += xfs/
obj-$(CONFIG_AFS_FS) += afs/
obj-$(CONFIG_BEFS_FS) += befs/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/adfs/Makefile linux/fs/adfs/Makefile
--- linux-2.5.51-bk1/fs/adfs/Makefile Sun Sep 15 22:18:16 2002
+++ linux/fs/adfs/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_ADFS_FS) += adfs.o
adfs-objs := dir.o dir_f.o dir_fplus.o file.o inode.o map.o super.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/affs/Makefile linux/fs/affs/Makefile
--- linux-2.5.51-bk1/fs/affs/Makefile Sun Sep 15 22:18:54 2002
+++ linux/fs/affs/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-$(CONFIG_AFFS_FS) += affs.o
affs-objs := super.o namei.o inode.o file.o dir.o amigaffs.o bitmap.o symlink.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/afs/Makefile linux/fs/afs/Makefile
--- linux-2.5.51-bk1/fs/afs/Makefile Sat Dec 14 12:31:59 2002
+++ linux/fs/afs/Makefile Sat Dec 14 12:38:56 2002
@@ -24,5 +24,3 @@
volume.o
obj-$(CONFIG_AFS_FS) := kafs.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/autofs/Makefile linux/fs/autofs/Makefile
--- linux-2.5.51-bk1/fs/autofs/Makefile Sun Sep 15 22:19:10 2002
+++ linux/fs/autofs/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_AUTOFS_FS) += autofs.o
autofs-objs := dirhash.o init.o inode.o root.o symlink.o waitq.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/autofs4/Makefile linux/fs/autofs4/Makefile
--- linux-2.5.51-bk1/fs/autofs4/Makefile Sun Sep 15 22:18:33 2002
+++ linux/fs/autofs4/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_AUTOFS4_FS) += autofs4.o
autofs4-objs := init.o inode.o root.o symlink.o waitq.o expire.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/befs/Makefile linux/fs/befs/Makefile
--- linux-2.5.51-bk1/fs/befs/Makefile Sat Dec 14 12:31:49 2002
+++ linux/fs/befs/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
obj-$(CONFIG_BEFS_FS) += befs.o
befs-objs := datastream.o btree.o super.o inode.o debug.o io.o linuxvfs.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/bfs/Makefile linux/fs/bfs/Makefile
--- linux-2.5.51-bk1/fs/bfs/Makefile Sun Sep 15 22:18:48 2002
+++ linux/fs/bfs/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_BFS_FS) += bfs.o
bfs-objs := inode.o file.o dir.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/cifs/Makefile linux/fs/cifs/Makefile
--- linux-2.5.51-bk1/fs/cifs/Makefile Sat Dec 14 12:31:41 2002
+++ linux/fs/cifs/Makefile Sat Dec 14 12:38:56 2002
@@ -4,5 +4,3 @@
obj-$(CONFIG_CIFS) += cifs.o
cifs-objs := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o md4.o md5.o cifs_unicode.o nterr.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/coda/Makefile linux/fs/coda/Makefile
--- linux-2.5.51-bk1/fs/coda/Makefile Sun Sep 15 22:18:43 2002
+++ linux/fs/coda/Makefile Sat Dec 14 12:38:56 2002
@@ -10,6 +10,3 @@
# If you want debugging output, please uncomment the following line.
# EXTRA_CFLAGS += -DDEBUG -DDEBUG_SMB_MALLOC=1
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/fs/cramfs/Makefile linux/fs/cramfs/Makefile
--- linux-2.5.51-bk1/fs/cramfs/Makefile Sun Sep 15 22:18:27 2002
+++ linux/fs/cramfs/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_CRAMFS) += cramfs.o
cramfs-objs := inode.o uncompress.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/devfs/Makefile linux/fs/devfs/Makefile
--- linux-2.5.51-bk1/fs/devfs/Makefile Sun Sep 15 22:18:18 2002
+++ linux/fs/devfs/Makefile Sat Dec 14 12:38:56 2002
@@ -13,9 +13,6 @@
TOPDIR = ../..
endif
-include $(TOPDIR)/Rules.make
-
-
# Rule to build documentation
doc: base.c util.c
@echo '$$PACKAGE devfs' > devfs.doc
diff -urN linux-2.5.51-bk1/fs/devpts/Makefile linux/fs/devpts/Makefile
--- linux-2.5.51-bk1/fs/devpts/Makefile Sun Sep 15 22:18:41 2002
+++ linux/fs/devpts/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_DEVPTS_FS) += devpts.o
devpts-objs := inode.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/efs/Makefile linux/fs/efs/Makefile
--- linux-2.5.51-bk1/fs/efs/Makefile Sun Sep 15 22:18:24 2002
+++ linux/fs/efs/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_EFS_FS) += efs.o
efs-objs := super.o inode.o namei.o dir.o file.o symlink.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/exportfs/Makefile linux/fs/exportfs/Makefile
--- linux-2.5.51-bk1/fs/exportfs/Makefile Sun Sep 15 22:18:25 2002
+++ linux/fs/exportfs/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-$(CONFIG_EXPORTFS) += exportfs.o
exportfs-objs := expfs.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/ext2/Makefile linux/fs/ext2/Makefile
--- linux-2.5.51-bk1/fs/ext2/Makefile Sat Dec 14 12:31:59 2002
+++ linux/fs/ext2/Makefile Sat Dec 14 12:38:56 2002
@@ -16,5 +16,3 @@
ifeq ($(CONFIG_EXT2_FS_POSIX_ACL),y)
ext2-objs += acl.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/ext3/Makefile linux/fs/ext3/Makefile
--- linux-2.5.51-bk1/fs/ext3/Makefile Sat Dec 14 12:31:59 2002
+++ linux/fs/ext3/Makefile Sat Dec 14 12:38:56 2002
@@ -16,5 +16,3 @@
ifeq ($(CONFIG_EXT3_FS_POSIX_ACL),y)
ext3-objs += acl.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/fat/Makefile linux/fs/fat/Makefile
--- linux-2.5.51-bk1/fs/fat/Makefile Sat Dec 14 12:31:50 2002
+++ linux/fs/fat/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-$(CONFIG_FAT_FS) += fat.o
fat-objs := cache.o dir.o file.o inode.o misc.o fatfs_syms.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/freevxfs/Makefile linux/fs/freevxfs/Makefile
--- linux-2.5.51-bk1/fs/freevxfs/Makefile Sun Sep 15 22:19:00 2002
+++ linux/fs/freevxfs/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
freevxfs-objs := vxfs_bmap.o vxfs_fshead.o vxfs_immed.o vxfs_inode.o \
vxfs_lookup.o vxfs_olt.o vxfs_subr.o vxfs_super.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/hfs/Makefile linux/fs/hfs/Makefile
--- linux-2.5.51-bk1/fs/hfs/Makefile Sun Sep 15 22:19:09 2002
+++ linux/fs/hfs/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
bnode.o brec.o btree.o catalog.o dir.o dir_cap.o dir_dbl.o \
dir_nat.o extent.o file.o file_cap.o file_hdr.o inode.o mdb.o \
part_tbl.o string.o super.o sysdep.o trans.o version.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/hpfs/Makefile linux/fs/hpfs/Makefile
--- linux-2.5.51-bk1/fs/hpfs/Makefile Sun Sep 15 22:18:17 2002
+++ linux/fs/hpfs/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
hpfs-objs := alloc.o anode.o buffer.o dentry.o dir.o dnode.o ea.o file.o \
inode.o map.o name.o namei.o super.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/hugetlbfs/Makefile linux/fs/hugetlbfs/Makefile
--- linux-2.5.51-bk1/fs/hugetlbfs/Makefile Sat Dec 14 12:31:59 2002
+++ linux/fs/hugetlbfs/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_HUGETLBFS) += hugetlbfs.o
hugetlbfs-objs := inode.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/intermezzo/Makefile linux/fs/intermezzo/Makefile
--- linux-2.5.51-bk1/fs/intermezzo/Makefile Sat Dec 14 12:31:43 2002
+++ linux/fs/intermezzo/Makefile Sat Dec 14 12:38:56 2002
@@ -9,6 +9,3 @@
journal_obdfs.o journal_reiserfs.o journal_tmpfs.o journal_xfs.o \
kml_reint.o kml_unpack.o methods.o presto.o psdev.o replicator.o \
super.o sysctl.o upcall.o vfs.o
-
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/isofs/Makefile linux/fs/isofs/Makefile
--- linux-2.5.51-bk1/fs/isofs/Makefile Sun Sep 15 22:19:07 2002
+++ linux/fs/isofs/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
isofs-objs-$(CONFIG_JOLIET) += joliet.o
isofs-objs-$(CONFIG_ZISOFS) += compress.o
isofs-objs := $(isofs-objs-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/jbd/Makefile linux/fs/jbd/Makefile
--- linux-2.5.51-bk1/fs/jbd/Makefile Sun Sep 15 22:18:28 2002
+++ linux/fs/jbd/Makefile Sat Dec 14 12:38:56 2002
@@ -7,6 +7,3 @@
obj-$(CONFIG_JBD) += jbd.o
jbd-objs := transaction.o commit.o recovery.o checkpoint.o revoke.o journal.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/fs/jffs/Makefile linux/fs/jffs/Makefile
--- linux-2.5.51-bk1/fs/jffs/Makefile Sun Sep 15 22:18:18 2002
+++ linux/fs/jffs/Makefile Sat Dec 14 12:38:56 2002
@@ -9,6 +9,3 @@
jffs-y := jffs_fm.o intrep.o inode-v23.o
jffs-$(CONFIG_JFFS_PROC_FS) += jffs_proc.o
jffs-objs := $(jffs-y)
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/fs/jffs2/Makefile linux/fs/jffs2/Makefile
--- linux-2.5.51-bk1/fs/jffs2/Makefile Sun Sep 15 22:18:23 2002
+++ linux/fs/jffs2/Makefile Sat Dec 14 12:38:56 2002
@@ -18,6 +18,3 @@
jffs2-objs := $(COMPR_OBJS) $(JFFS2_OBJS) $(VERS_OBJS) $(NAND_OBJS-y) \
$(LINUX_OBJS-$(VERSION)$(PATCHLEVEL))
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/fs/jfs/Makefile linux/fs/jfs/Makefile
--- linux-2.5.51-bk1/fs/jfs/Makefile Sat Dec 14 12:31:59 2002
+++ linux/fs/jfs/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
endif
EXTRA_CFLAGS += -D_JFS_4K
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/lockd/Makefile linux/fs/lockd/Makefile
--- linux-2.5.51-bk1/fs/lockd/Makefile Sun Sep 15 22:18:19 2002
+++ linux/fs/lockd/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
svcproc.o svcsubs.o mon.o xdr.o lockd_syms.o
lockd-objs-$(CONFIG_LOCKD_V4) += xdr4.o svc4proc.o
lockd-objs := $(lockd-objs-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/minix/Makefile linux/fs/minix/Makefile
--- linux-2.5.51-bk1/fs/minix/Makefile Sun Sep 15 22:18:23 2002
+++ linux/fs/minix/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_MINIX_FS) += minix.o
minix-objs := bitmap.o itree_v1.o itree_v2.o namei.o inode.o file.o dir.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/msdos/Makefile linux/fs/msdos/Makefile
--- linux-2.5.51-bk1/fs/msdos/Makefile Sun Sep 15 22:18:53 2002
+++ linux/fs/msdos/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-$(CONFIG_MSDOS_FS) += msdos.o
msdos-objs := namei.o msdosfs_syms.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/ncpfs/Makefile linux/fs/ncpfs/Makefile
--- linux-2.5.51-bk1/fs/ncpfs/Makefile Sat Dec 14 12:31:33 2002
+++ linux/fs/ncpfs/Makefile Sat Dec 14 12:38:56 2002
@@ -17,5 +17,3 @@
# EXTRA_CFLAGS += -DDEBUG_NCP=1
CFLAGS_ncplib_kernel.o := -finline-functions
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/nfs/Makefile linux/fs/nfs/Makefile
--- linux-2.5.51-bk1/fs/nfs/Makefile Sat Dec 14 12:32:01 2002
+++ linux/fs/nfs/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
nfs-$(CONFIG_NFS_V4) += nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o
nfs-$(CONFIG_NFS_DIRECTIO) += direct.o
nfs-objs := $(nfs-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/nfsd/Makefile linux/fs/nfsd/Makefile
--- linux-2.5.51-bk1/fs/nfsd/Makefile Sat Dec 14 12:31:41 2002
+++ linux/fs/nfsd/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
nfsd-$(CONFIG_NFSD_V3) += nfs3proc.o nfs3xdr.o
nfsd-$(CONFIG_NFSD_V4) += nfs4proc.o nfs4xdr.o
nfsd-objs := $(nfsd-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/nls/Makefile linux/fs/nls/Makefile
--- linux-2.5.51-bk1/fs/nls/Makefile Sun Sep 15 22:18:22 2002
+++ linux/fs/nls/Makefile Sat Dec 14 12:38:56 2002
@@ -45,5 +45,3 @@
obj-$(CONFIG_NLS_KOI8_U) += nls_koi8-u.o nls_koi8-ru.o
obj-$(CONFIG_NLS_ABC) += nls_abc.o
obj-$(CONFIG_NLS_UTF8) += nls_utf8.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/ntfs/Makefile linux/fs/ntfs/Makefile
--- linux-2.5.51-bk1/fs/ntfs/Makefile Sun Sep 15 22:18:17 2002
+++ linux/fs/ntfs/Makefile Sat Dec 14 12:38:56 2002
@@ -14,6 +14,3 @@
ifeq ($(CONFIG_NTFS_RW),y)
EXTRA_CFLAGS += -DNTFS_RW
endif
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/fs/openpromfs/Makefile linux/fs/openpromfs/Makefile
--- linux-2.5.51-bk1/fs/openpromfs/Makefile Sun Sep 15 22:18:27 2002
+++ linux/fs/openpromfs/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_SUN_OPENPROMFS) += openpromfs.o
openpromfs-objs := inode.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/partitions/Makefile linux/fs/partitions/Makefile
--- linux-2.5.51-bk1/fs/partitions/Makefile Sun Sep 15 22:18:27 2002
+++ linux/fs/partitions/Makefile Sat Dec 14 12:38:56 2002
@@ -18,6 +18,3 @@
obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o
obj-$(CONFIG_IBM_PARTITION) += ibm.o
obj-$(CONFIG_EFI_PARTITION) += efi.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/fs/proc/Makefile linux/fs/proc/Makefile
--- linux-2.5.51-bk1/fs/proc/Makefile Sun Sep 15 22:18:18 2002
+++ linux/fs/proc/Makefile Sat Dec 14 12:38:56 2002
@@ -12,5 +12,3 @@
ifeq ($(CONFIG_PROC_DEVICETREE),y)
proc-objs += proc_devtree.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/qnx4/Makefile linux/fs/qnx4/Makefile
--- linux-2.5.51-bk1/fs/qnx4/Makefile Sun Sep 15 22:18:28 2002
+++ linux/fs/qnx4/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_QNX4FS_FS) += qnx4.o
qnx4-objs := inode.o dir.o namei.o file.o bitmap.o truncate.o fsync.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/ramfs/Makefile linux/fs/ramfs/Makefile
--- linux-2.5.51-bk1/fs/ramfs/Makefile Sun Sep 15 22:19:05 2002
+++ linux/fs/ramfs/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_RAMFS) += ramfs.o
ramfs-objs := inode.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/reiserfs/Makefile linux/fs/reiserfs/Makefile
--- linux-2.5.51-bk1/fs/reiserfs/Makefile Sun Sep 15 22:19:06 2002
+++ linux/fs/reiserfs/Makefile Sat Dec 14 12:38:56 2002
@@ -19,8 +19,6 @@
EXTRA_CFLAGS := -O1
endif
-include $(TOPDIR)/Rules.make
-
TAGS:
etags *.c
diff -urN linux-2.5.51-bk1/fs/romfs/Makefile linux/fs/romfs/Makefile
--- linux-2.5.51-bk1/fs/romfs/Makefile Sun Sep 15 22:18:22 2002
+++ linux/fs/romfs/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_ROMFS_FS) += romfs.o
romfs-objs := inode.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/smbfs/Makefile linux/fs/smbfs/Makefile
--- linux-2.5.51-bk1/fs/smbfs/Makefile Sat Dec 14 12:31:36 2002
+++ linux/fs/smbfs/Makefile Sat Dec 14 12:38:56 2002
@@ -17,8 +17,6 @@
#EXTRA_CFLAGS += -DDEBUG_SMB_TIMESTAMP
#EXTRA_CFLAGS += -Werror
-include $(TOPDIR)/Rules.make
-
#
# Maintainer rules
#
diff -urN linux-2.5.51-bk1/fs/sysfs/Makefile linux/fs/sysfs/Makefile
--- linux-2.5.51-bk1/fs/sysfs/Makefile Sat Dec 14 12:31:44 2002
+++ linux/fs/sysfs/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
export-objs := inode.o
obj-y := inode.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/sysv/Makefile linux/fs/sysv/Makefile
--- linux-2.5.51-bk1/fs/sysv/Makefile Sun Sep 15 22:18:43 2002
+++ linux/fs/sysv/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
sysv-objs := ialloc.o balloc.o inode.o itree.o file.o dir.o \
namei.o super.o symlink.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/udf/Makefile linux/fs/udf/Makefile
--- linux-2.5.51-bk1/fs/udf/Makefile Sun Sep 15 22:18:18 2002
+++ linux/fs/udf/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
udf-objs := balloc.o dir.o file.o ialloc.o inode.o lowlevel.o namei.o \
partition.o super.o truncate.o symlink.o fsync.o \
crc.o directory.o misc.o udftime.o unicode.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/ufs/Makefile linux/fs/ufs/Makefile
--- linux-2.5.51-bk1/fs/ufs/Makefile Sun Sep 15 22:18:22 2002
+++ linux/fs/ufs/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
ufs-objs := balloc.o cylinder.o dir.o file.o ialloc.o inode.o \
namei.o super.o symlink.o truncate.o util.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/umsdos/Makefile linux/fs/umsdos/Makefile
--- linux-2.5.51-bk1/fs/umsdos/Makefile Sat Dec 14 12:31:36 2002
+++ linux/fs/umsdos/Makefile Sat Dec 14 12:38:56 2002
@@ -6,8 +6,6 @@
umsdos-objs := dir.o inode.o ioctl.o mangle.o namei.o rdir.o emd.o
-include $(TOPDIR)/Rules.make
-
p:
proto *.c >/usr/include/linux/umsdos_fs.p
diff -urN linux-2.5.51-bk1/fs/vfat/Makefile linux/fs/vfat/Makefile
--- linux-2.5.51-bk1/fs/vfat/Makefile Sun Sep 15 22:18:50 2002
+++ linux/fs/vfat/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-$(CONFIG_VFAT_FS) += vfat.o
vfat-objs := namei.o vfatfs_syms.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/fs/xfs/Makefile linux/fs/xfs/Makefile
--- linux-2.5.51-bk1/fs/xfs/Makefile Sat Dec 14 12:32:01 2002
+++ linux/fs/xfs/Makefile Sat Dec 14 12:38:56 2002
@@ -157,5 +157,3 @@
endif
CFLAGS_xfsidbg.o += -Iarch/$(ARCH)/kdb
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/init/Makefile linux/init/Makefile
--- linux-2.5.51-bk1/init/Makefile Sat Dec 14 12:31:59 2002
+++ linux/init/Makefile Sat Dec 14 12:38:56 2002
@@ -7,8 +7,6 @@
# files to be removed upon make clean
clean-files := ../include/linux/compile.h
-include $(TOPDIR)/Rules.make
-
# dependencies on generated files need to be listed explicitly
$(obj)/version.o: include/linux/compile.h
diff -urN linux-2.5.51-bk1/ipc/Makefile linux/ipc/Makefile
--- linux-2.5.51-bk1/ipc/Makefile Sat Dec 14 12:31:33 2002
+++ linux/ipc/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-y := util.o
obj-$(CONFIG_SYSVIPC) += msg.o sem.o shm.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/kernel/Makefile linux/kernel/Makefile
--- linux-2.5.51-bk1/kernel/Makefile Sat Dec 14 12:32:13 2002
+++ linux/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -31,5 +31,3 @@
# to get a correct value for the wait-channel (WCHAN in ps). --davidm
CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/lib/Makefile linux/lib/Makefile
--- linux-2.5.51-bk1/lib/Makefile Sat Dec 14 12:31:50 2002
+++ linux/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -31,5 +31,3 @@
include $(TOPDIR)/drivers/usb/class/Makefile.lib
include $(TOPDIR)/fs/Makefile.lib
include $(TOPDIR)/net/bluetooth/bnep/Makefile.lib
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/lib/zlib_deflate/Makefile linux/lib/zlib_deflate/Makefile
--- linux-2.5.51-bk1/lib/zlib_deflate/Makefile Sun Sep 15 22:18:41 2002
+++ linux/lib/zlib_deflate/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate.o
zlib_deflate-objs := deflate.o deftree.o deflate_syms.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/lib/zlib_inflate/Makefile linux/lib/zlib_inflate/Makefile
--- linux-2.5.51-bk1/lib/zlib_inflate/Makefile Sun Sep 15 22:18:50 2002
+++ linux/lib/zlib_inflate/Makefile Sat Dec 14 12:38:56 2002
@@ -19,5 +19,3 @@
zlib_inflate-objs := infblock.o infcodes.o inffast.o inflate.o \
inftrees.o infutil.o inflate_syms.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/802/Makefile linux/net/802/Makefile
--- linux-2.5.51-bk1/net/802/Makefile Sun Sep 15 22:18:27 2002
+++ linux/net/802/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
obj-$(CONFIG_HIPPI) += hippi.o
obj-$(CONFIG_IPX) += p8022.o psnap.o
obj-$(CONFIG_ATALK) += p8022.o psnap.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/8021q/Makefile linux/net/8021q/Makefile
--- linux-2.5.51-bk1/net/8021q/Makefile Sun Sep 15 22:19:00 2002
+++ linux/net/8021q/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_VLAN_8021Q) += 8021q.o
8021q-objs := vlan.o vlanproc.o vlan_dev.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/Makefile linux/net/Makefile
--- linux-2.5.51-bk1/net/Makefile Sat Dec 14 12:32:01 2002
+++ linux/net/Makefile Sat Dec 14 12:38:56 2002
@@ -41,5 +41,3 @@
obj-$(CONFIG_MODULES) += netsyms.o
obj-$(CONFIG_SYSCTL) += sysctl_net.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/appletalk/Makefile linux/net/appletalk/Makefile
--- linux-2.5.51-bk1/net/appletalk/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/appletalk/Makefile Sat Dec 14 12:38:56 2002
@@ -8,6 +8,3 @@
appletalk-y := aarp.o ddp.o atalk_proc.o
appletalk-$(CONFIG_SYSCTL) += sysctl_net_atalk.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/net/atm/Makefile linux/net/atm/Makefile
--- linux-2.5.51-bk1/net/atm/Makefile Sun Sep 15 22:18:21 2002
+++ linux/net/atm/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
obj-$(CONFIG_ATM_LANE) += lec.o
obj-$(CONFIG_ATM_MPOA) += mpoa.o
obj-$(CONFIG_PPPOATM) += pppoatm.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/ax25/Makefile linux/net/ax25/Makefile
--- linux-2.5.51-bk1/net/ax25/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/ax25/Makefile Sat Dec 14 12:38:56 2002
@@ -11,6 +11,3 @@
ax25_subr.o ax25_timer.o ax25_uid.o af_ax25.o
ax25-$(CONFIG_AX25_DAMA_SLAVE) += ax25_ds_in.o ax25_ds_subr.o ax25_ds_timer.o
ax25-$(CONFIG_SYSCTL) += sysctl_net_ax25.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/net/bluetooth/Makefile linux/net/bluetooth/Makefile
--- linux-2.5.51-bk1/net/bluetooth/Makefile Sat Dec 14 12:31:59 2002
+++ linux/net/bluetooth/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
obj-$(CONFIG_BT_BNEP) += bnep/
bluetooth-objs := af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o hci_proc.o lib.o syms.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/bluetooth/bnep/Makefile linux/net/bluetooth/bnep/Makefile
--- linux-2.5.51-bk1/net/bluetooth/bnep/Makefile Sat Dec 14 12:31:44 2002
+++ linux/net/bluetooth/bnep/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_BT_BNEP) += bnep.o
bnep-objs := core.o sock.o netdev.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/bluetooth/rfcomm/Makefile linux/net/bluetooth/rfcomm/Makefile
--- linux-2.5.51-bk1/net/bluetooth/rfcomm/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/bluetooth/rfcomm/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
rfcomm-y := core.o sock.o crc.o
rfcomm-$(CONFIG_BT_RFCOMM_TTY) += tty.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/bridge/Makefile linux/net/bridge/Makefile
--- linux-2.5.51-bk1/net/bridge/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/bridge/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
endif
obj-$(CONFIG_BRIDGE_NF_EBTABLES) += netfilter/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/bridge/netfilter/Makefile linux/net/bridge/netfilter/Makefile
--- linux-2.5.51-bk1/net/bridge/netfilter/Makefile Sat Dec 14 12:31:33 2002
+++ linux/net/bridge/netfilter/Makefile Sat Dec 14 12:38:56 2002
@@ -17,4 +17,3 @@
obj-$(CONFIG_BRIDGE_EBT_DNAT) += ebt_dnat.o
obj-$(CONFIG_BRIDGE_EBT_REDIRECT) += ebt_redirect.o
obj-$(CONFIG_BRIDGE_EBT_MARK_T) += ebt_mark.o
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/core/Makefile linux/net/core/Makefile
--- linux-2.5.51-bk1/net/core/Makefile Sat Dec 14 12:32:13 2002
+++ linux/net/core/Makefile Sat Dec 14 12:38:56 2002
@@ -21,5 +21,3 @@
obj-$(CONFIG_NET_RADIO) += wireless.o
# Ugly. I wish all wireless drivers were moved in drivers/net/wireless
obj-$(CONFIG_NET_PCMCIA_RADIO) += wireless.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/decnet/Makefile linux/net/decnet/Makefile
--- linux-2.5.51-bk1/net/decnet/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/decnet/Makefile Sat Dec 14 12:38:56 2002
@@ -5,6 +5,3 @@
decnet-$(CONFIG_DECNET_ROUTER) += dn_fib.o dn_rules.o dn_table.o
decnet-$(CONFIG_DECNET_FW) += dn_fw.o
decnet-y += sysctl_net_decnet.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/net/econet/Makefile linux/net/econet/Makefile
--- linux-2.5.51-bk1/net/econet/Makefile Sun Sep 15 22:18:27 2002
+++ linux/net/econet/Makefile Sat Dec 14 12:38:56 2002
@@ -5,6 +5,3 @@
obj-$(CONFIG_ECONET) += econet.o
econet-objs := af_econet.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/net/ethernet/Makefile linux/net/ethernet/Makefile
--- linux-2.5.51-bk1/net/ethernet/Makefile Sun Sep 15 22:18:18 2002
+++ linux/net/ethernet/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-$(CONFIG_SYSCTL) += sysctl_net_ether.o
obj-$(subst m,y,$(CONFIG_IPX)) += pe2.o
obj-$(subst m,y,$(CONFIG_ATALK)) += pe2.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/ipv4/Makefile linux/net/ipv4/Makefile
--- linux-2.5.51-bk1/net/ipv4/Makefile Sat Dec 14 12:32:03 2002
+++ linux/net/ipv4/Makefile Sat Dec 14 12:38:56 2002
@@ -23,5 +23,3 @@
obj-$(CONFIG_XFRM_USER) += xfrm_user.o
obj-y += xfrm_policy.o xfrm_state.o xfrm_input.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/ipv4/netfilter/Makefile linux/net/ipv4/netfilter/Makefile
--- linux-2.5.51-bk1/net/ipv4/netfilter/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/ipv4/netfilter/Makefile Sat Dec 14 12:38:56 2002
@@ -93,5 +93,3 @@
obj-$(CONFIG_IP_NF_COMPAT_IPFWADM) += ipfwadm.o
obj-$(CONFIG_IP_NF_QUEUE) += ip_queue.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/ipv6/Makefile linux/net/ipv6/Makefile
--- linux-2.5.51-bk1/net/ipv6/Makefile Sat Dec 14 12:31:43 2002
+++ linux/net/ipv6/Makefile Sat Dec 14 12:38:56 2002
@@ -13,5 +13,3 @@
ip6_flowlabel.o ipv6_syms.o
obj-$(CONFIG_NETFILTER) += netfilter/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/ipv6/netfilter/Makefile linux/net/ipv6/netfilter/Makefile
--- linux-2.5.51-bk1/net/ipv6/netfilter/Makefile Sun Sep 15 22:18:18 2002
+++ linux/net/ipv6/netfilter/Makefile Sat Dec 14 12:38:56 2002
@@ -18,5 +18,3 @@
obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t_MARK.o
obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/ipx/Makefile linux/net/ipx/Makefile
--- linux-2.5.51-bk1/net/ipx/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/ipx/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
ipx-y := af_ipx.o ipx_proc.o
ipx-$(CONFIG_SYSCTL) += sysctl_net_ipx.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/irda/Makefile linux/net/irda/Makefile
--- linux-2.5.51-bk1/net/irda/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/irda/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
discovery.o parameters.o irsyms.o
irda-$(CONFIG_PROC_FS) += irproc.o
irda-$(CONFIG_SYSCTL) += irsysctl.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/irda/ircomm/Makefile linux/net/irda/ircomm/Makefile
--- linux-2.5.51-bk1/net/irda/ircomm/Makefile Sun Sep 15 22:18:18 2002
+++ linux/net/irda/ircomm/Makefile Sat Dec 14 12:38:56 2002
@@ -8,6 +8,3 @@
ircomm-objs := ircomm_core.o ircomm_event.o ircomm_lmp.o ircomm_ttp.o
ircomm-tty-objs := ircomm_tty.o ircomm_tty_attach.o ircomm_tty_ioctl.o ircomm_param.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/net/irda/irlan/Makefile linux/net/irda/irlan/Makefile
--- linux-2.5.51-bk1/net/irda/irlan/Makefile Sun Sep 15 22:18:22 2002
+++ linux/net/irda/irlan/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_IRLAN) += irlan.o
irlan-objs := irlan_common.o irlan_eth.o irlan_event.o irlan_client.o irlan_provider.o irlan_filter.o irlan_provider_event.o irlan_client_event.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/irda/irnet/Makefile linux/net/irda/irnet/Makefile
--- linux-2.5.51-bk1/net/irda/irnet/Makefile Sun Sep 15 22:18:50 2002
+++ linux/net/irda/irnet/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_IRNET) += irnet.o
irnet-objs := irnet_ppp.o irnet_irda.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/key/Makefile linux/net/key/Makefile
--- linux-2.5.51-bk1/net/key/Makefile Sat Dec 14 12:32:01 2002
+++ linux/net/key/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-$(CONFIG_NET_KEY) += af_key.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/lapb/Makefile linux/net/lapb/Makefile
--- linux-2.5.51-bk1/net/lapb/Makefile Sun Sep 15 22:18:17 2002
+++ linux/net/lapb/Makefile Sat Dec 14 12:38:56 2002
@@ -7,6 +7,3 @@
obj-$(CONFIG_LAPB) += lapb.o
lapb-objs := lapb_in.o lapb_out.o lapb_subr.o lapb_timer.o lapb_iface.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/net/llc/Makefile linux/net/llc/Makefile
--- linux-2.5.51-bk1/net/llc/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/llc/Makefile Sat Dec 14 12:38:56 2002
@@ -21,5 +21,3 @@
# Objects that export symbols.
export-objs := llc_if.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/netlink/Makefile linux/net/netlink/Makefile
--- linux-2.5.51-bk1/net/netlink/Makefile Sun Sep 15 22:18:26 2002
+++ linux/net/netlink/Makefile Sat Dec 14 12:38:56 2002
@@ -4,5 +4,3 @@
obj-y := af_netlink.o
obj-$(CONFIG_NETLINK_DEV) += netlink_dev.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/netrom/Makefile linux/net/netrom/Makefile
--- linux-2.5.51-bk1/net/netrom/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/netrom/Makefile Sat Dec 14 12:38:56 2002
@@ -7,6 +7,3 @@
netrom-y := af_netrom.o nr_dev.o nr_in.o nr_loopback.o \
nr_out.o nr_route.o nr_subr.o nr_timer.o
netrom-$(CONFIG_SYSCTL) += sysctl_net_netrom.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/net/packet/Makefile linux/net/packet/Makefile
--- linux-2.5.51-bk1/net/packet/Makefile Sun Sep 15 22:18:22 2002
+++ linux/net/packet/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-$(CONFIG_PACKET) += af_packet.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/rose/Makefile linux/net/rose/Makefile
--- linux-2.5.51-bk1/net/rose/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/rose/Makefile Sat Dec 14 12:38:56 2002
@@ -7,6 +7,3 @@
rose-y := af_rose.o rose_dev.o rose_in.o rose_link.o rose_loopback.o \
rose_out.o rose_route.o rose_subr.o rose_timer.o
rose-$(CONFIG_SYSCTL) += sysctl_net_rose.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/net/rxrpc/Makefile linux/net/rxrpc/Makefile
--- linux-2.5.51-bk1/net/rxrpc/Makefile Sat Dec 14 12:31:59 2002
+++ linux/net/rxrpc/Makefile Sat Dec 14 12:38:56 2002
@@ -23,5 +23,3 @@
endif
obj-$(CONFIG_RXRPC) := rxrpc.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/sched/Makefile linux/net/sched/Makefile
--- linux-2.5.51-bk1/net/sched/Makefile Sun Sep 15 22:18:29 2002
+++ linux/net/sched/Makefile Sat Dec 14 12:38:56 2002
@@ -28,5 +28,3 @@
obj-$(CONFIG_NET_CLS_RSVP6) += cls_rsvp6.o
obj-$(CONFIG_NET_CLS_ROUTE4) += cls_route.o
obj-$(CONFIG_NET_CLS_FW) += cls_fw.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/sctp/Makefile linux/net/sctp/Makefile
--- linux-2.5.51-bk1/net/sctp/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/sctp/Makefile Sat Dec 14 12:38:56 2002
@@ -22,5 +22,3 @@
sctp-$(CONFIG_SYSCTL) += sysctl.o
sctp-$(subst m,y,$(CONFIG_IPV6)) += ipv6.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/sunrpc/Makefile linux/net/sunrpc/Makefile
--- linux-2.5.51-bk1/net/sunrpc/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/sunrpc/Makefile Sat Dec 14 12:38:56 2002
@@ -13,5 +13,3 @@
sunrpc_syms.o cache.o
sunrpc-$(CONFIG_PROC_FS) += stats.o
sunrpc-$(CONFIG_SYSCTL) += sysctl.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/unix/Makefile linux/net/unix/Makefile
--- linux-2.5.51-bk1/net/unix/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/unix/Makefile Sat Dec 14 12:38:56 2002
@@ -6,6 +6,3 @@
unix-y := af_unix.o garbage.o
unix-$(CONFIG_SYSCTL) += sysctl_net_unix.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/net/wanrouter/Makefile linux/net/wanrouter/Makefile
--- linux-2.5.51-bk1/net/wanrouter/Makefile Sun Sep 15 22:18:20 2002
+++ linux/net/wanrouter/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-$(CONFIG_WAN_ROUTER) += wanrouter.o
wanrouter-objs := wanproc.o wanmain.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/net/x25/Makefile linux/net/x25/Makefile
--- linux-2.5.51-bk1/net/x25/Makefile Sat Dec 14 12:31:50 2002
+++ linux/net/x25/Makefile Sat Dec 14 12:38:56 2002
@@ -8,6 +8,3 @@
x25_link.o x25_out.o x25_route.o x25_subr.o \
x25_timer.o x25_proc.o
x25-$(CONFIG_SYSCTL) += sysctl_net_x25.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/scripts/kconfig/Makefile linux/scripts/kconfig/Makefile
--- linux-2.5.51-bk1/scripts/kconfig/Makefile Sat Dec 14 12:31:59 2002
+++ linux/scripts/kconfig/Makefile Sat Dec 14 12:38:56 2002
@@ -21,8 +21,6 @@
clean-files := libkconfig.so lkc_defs.h qconf.moc .tmp_qtcheck \
zconf.tab.c zconf.tab.h lex.zconf.c
-include $(TOPDIR)/Rules.make
-
# generated files seem to need this to find local include files
HOSTCFLAGS_lex.zconf.o := -I$(src)
HOSTCFLAGS_zconf.tab.o := -I$(src)
diff -urN linux-2.5.51-bk1/security/Makefile linux/security/Makefile
--- linux-2.5.51-bk1/security/Makefile Sat Dec 14 12:32:13 2002
+++ linux/security/Makefile Sat Dec 14 12:38:56 2002
@@ -14,5 +14,3 @@
obj-$(CONFIG_SECURITY) += security.o dummy.o
obj-$(CONFIG_SECURITY_CAPABILITIES) += capability.o
obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/Makefile linux/sound/Makefile
--- linux-2.5.51-bk1/sound/Makefile Sat Dec 14 12:31:38 2002
+++ linux/sound/Makefile Sat Dec 14 12:38:56 2002
@@ -12,5 +12,3 @@
endif
soundcore-objs := sound_core.o sound_firmware.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/arm/Makefile linux/sound/arm/Makefile
--- linux-2.5.51-bk1/sound/arm/Makefile Sun Sep 15 22:18:53 2002
+++ linux/sound/arm/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/core/Makefile linux/sound/core/Makefile
--- linux-2.5.51-bk1/sound/core/Makefile Sat Dec 14 12:31:50 2002
+++ linux/sound/core/Makefile Sat Dec 14 12:38:56 2002
@@ -103,5 +103,3 @@
obj-$(CONFIG_SND_USB_AUDIO) += snd-pcm.o snd-timer.o snd.o snd-rawmidi.o
obj-m := $(sort $(obj-m))
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/core/ioctl32/Makefile linux/sound/core/ioctl32/Makefile
--- linux-2.5.51-bk1/sound/core/ioctl32/Makefile Sat Dec 14 12:31:36 2002
+++ linux/sound/core/ioctl32/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
endif
obj-$(CONFIG_SND_BIT32_EMUL) += snd-ioctl32.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/core/oss/Makefile linux/sound/core/oss/Makefile
--- linux-2.5.51-bk1/sound/core/oss/Makefile Sun Sep 15 22:18:18 2002
+++ linux/sound/core/oss/Makefile Sat Dec 14 12:38:56 2002
@@ -12,5 +12,3 @@
obj-$(CONFIG_SND_MIXER_OSS) += snd-mixer-oss.o
obj-$(CONFIG_SND_PCM_OSS) += snd-pcm-oss.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/core/seq/Makefile linux/sound/core/seq/Makefile
--- linux-2.5.51-bk1/sound/core/seq/Makefile Sat Dec 14 12:31:50 2002
+++ linux/sound/core/seq/Makefile Sat Dec 14 12:38:56 2002
@@ -76,5 +76,3 @@
obj-$(CONFIG_SND_USB_AUDIO) += snd-seq.o snd-seq-device.o snd-seq-midi-event.o
obj-m := $(sort $(obj-m))
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/core/seq/instr/Makefile linux/sound/core/seq/instr/Makefile
--- linux-2.5.51-bk1/sound/core/seq/instr/Makefile Sat Dec 14 12:31:36 2002
+++ linux/sound/core/seq/instr/Makefile Sat Dec 14 12:38:56 2002
@@ -42,5 +42,3 @@
obj-$(CONFIG_SND_YMFPCI) += snd-ainstr-fm.o
obj-m := $(sort $(obj-m))
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/core/seq/oss/Makefile linux/sound/core/seq/oss/Makefile
--- linux-2.5.51-bk1/sound/core/seq/oss/Makefile Sat Dec 14 12:31:36 2002
+++ linux/sound/core/seq/oss/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)
obj-$(CONFIG_SND_SEQUENCER) += snd-seq-oss.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/drivers/Makefile linux/sound/drivers/Makefile
--- linux-2.5.51-bk1/sound/drivers/Makefile Sun Sep 15 22:18:43 2002
+++ linux/sound/drivers/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
obj-$(CONFIG_SND_MTPAV) += snd-mtpav.o
obj-$(CONFIG_SND) += opl3/ mpu401/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/drivers/mpu401/Makefile linux/sound/drivers/mpu401/Makefile
--- linux-2.5.51-bk1/sound/drivers/mpu401/Makefile Sat Dec 14 12:31:38 2002
+++ linux/sound/drivers/mpu401/Makefile Sat Dec 14 12:38:56 2002
@@ -41,5 +41,3 @@
obj-$(CONFIG_SND_YMFPCI) += snd-mpu401-uart.o
obj-m := $(sort $(obj-m))
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/drivers/opl3/Makefile linux/sound/drivers/opl3/Makefile
--- linux-2.5.51-bk1/sound/drivers/opl3/Makefile Sat Dec 14 12:31:36 2002
+++ linux/sound/drivers/opl3/Makefile Sat Dec 14 12:38:56 2002
@@ -66,5 +66,3 @@
endif
obj-m := $(sort $(obj-m))
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/i2c/Makefile linux/sound/i2c/Makefile
--- linux-2.5.51-bk1/sound/i2c/Makefile Sun Sep 15 22:18:30 2002
+++ linux/sound/i2c/Makefile Sat Dec 14 12:38:56 2002
@@ -16,5 +16,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_INTERWAVE_STB) += snd-tea6330t.o snd-i2c.o
obj-$(CONFIG_SND_ICE1712) += snd-cs8427.o snd-i2c.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/i2c/l3/Makefile linux/sound/i2c/l3/Makefile
--- linux-2.5.51-bk1/sound/i2c/l3/Makefile Sun Sep 15 22:18:31 2002
+++ linux/sound/i2c/l3/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
# Module Dependency
obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-uda1341.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/isa/Makefile linux/sound/isa/Makefile
--- linux-2.5.51-bk1/sound/isa/Makefile Sat Dec 14 12:31:36 2002
+++ linux/sound/isa/Makefile Sat Dec 14 12:38:56 2002
@@ -22,5 +22,3 @@
obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ gus/ opti9xx/ \
sb/ wavefront/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/isa/ad1816a/Makefile linux/sound/isa/ad1816a/Makefile
--- linux-2.5.51-bk1/sound/isa/ad1816a/Makefile Sun Sep 15 22:18:27 2002
+++ linux/sound/isa/ad1816a/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_AD1816A) += snd-ad1816a.o snd-ad1816a-lib.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/isa/ad1848/Makefile linux/sound/isa/ad1848/Makefile
--- linux-2.5.51-bk1/sound/isa/ad1848/Makefile Sun Sep 15 22:18:26 2002
+++ linux/sound/isa/ad1848/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ad1848-lib.o
obj-m := $(sort $(obj-m))
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/isa/cs423x/Makefile linux/sound/isa/cs423x/Makefile
--- linux-2.5.51-bk1/sound/isa/cs423x/Makefile Sun Sep 15 22:18:50 2002
+++ linux/sound/isa/cs423x/Makefile Sat Dec 14 12:38:56 2002
@@ -24,5 +24,3 @@
obj-$(CONFIG_SND_WAVEFRONT) += snd-cs4231-lib.o
obj-m := $(sort $(obj-m))
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/isa/es1688/Makefile linux/sound/isa/es1688/Makefile
--- linux-2.5.51-bk1/sound/isa/es1688/Makefile Sun Sep 15 22:18:43 2002
+++ linux/sound/isa/es1688/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_ES1688) += snd-es1688.o snd-es1688-lib.o
obj-$(CONFIG_SND_GUSEXTREME) += snd-es1688-lib.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/isa/gus/Makefile linux/sound/isa/gus/Makefile
--- linux-2.5.51-bk1/sound/isa/gus/Makefile Sun Sep 15 22:19:01 2002
+++ linux/sound/isa/gus/Makefile Sat Dec 14 12:38:56 2002
@@ -34,5 +34,3 @@
endif
obj-m := $(sort $(obj-m))
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/isa/opti9xx/Makefile linux/sound/isa/opti9xx/Makefile
--- linux-2.5.51-bk1/sound/isa/opti9xx/Makefile Sun Sep 15 22:18:50 2002
+++ linux/sound/isa/opti9xx/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-opti92x-ad1848.o
obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-opti92x-cs4231.o
obj-$(CONFIG_SND_OPTI93X) += snd-opti93x.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/isa/sb/Makefile linux/sound/isa/sb/Makefile
--- linux-2.5.51-bk1/sound/isa/sb/Makefile Sat Dec 14 12:31:36 2002
+++ linux/sound/isa/sb/Makefile Sat Dec 14 12:38:56 2002
@@ -33,5 +33,3 @@
endif
obj-m := $(sort $(obj-m))
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/isa/wavefront/Makefile linux/sound/isa/wavefront/Makefile
--- linux-2.5.51-bk1/sound/isa/wavefront/Makefile Sun Sep 15 22:18:37 2002
+++ linux/sound/isa/wavefront/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_WAVEFRONT) += snd-wavefront.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/oss/Makefile linux/sound/oss/Makefile
--- linux-2.5.51-bk1/sound/oss/Makefile Sat Dec 14 12:32:08 2002
+++ linux/sound/oss/Makefile Sat Dec 14 12:38:56 2002
@@ -100,8 +100,6 @@
clean-files := maui_boot.h msndperm.c msndinit.c pndsperm.c pndspini.c \
pss_boot.h trix_boot.h
-include $(TOPDIR)/Rules.make
-
# Firmware files that need translation
#
# The translated files are protected by a file that keeps track
diff -urN linux-2.5.51-bk1/sound/oss/cs4281/Makefile linux/sound/oss/cs4281/Makefile
--- linux-2.5.51-bk1/sound/oss/cs4281/Makefile Sun Sep 15 22:18:18 2002
+++ linux/sound/oss/cs4281/Makefile Sat Dec 14 12:38:56 2002
@@ -4,5 +4,3 @@
obj-$(CONFIG_SOUND_CS4281) += cs4281.o
cs4281-objs += cs4281m.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/oss/dmasound/Makefile linux/sound/oss/dmasound/Makefile
--- linux-2.5.51-bk1/sound/oss/dmasound/Makefile Sun Sep 15 22:18:23 2002
+++ linux/sound/oss/dmasound/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
obj-$(CONFIG_DMASOUND_AWACS) += dmasound_core.o dmasound_awacs.o
obj-$(CONFIG_DMASOUND_PAULA) += dmasound_core.o dmasound_paula.o
obj-$(CONFIG_DMASOUND_Q40) += dmasound_core.o dmasound_q40.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/oss/emu10k1/Makefile linux/sound/oss/emu10k1/Makefile
--- linux-2.5.51-bk1/sound/oss/emu10k1/Makefile Sun Sep 15 22:18:53 2002
+++ linux/sound/oss/emu10k1/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
ifdef CONFIG_MIDI_EMU10K1
EXTRA_CFLAGS += -DEMU10K1_SEQUENCER
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/pci/Makefile linux/sound/pci/Makefile
--- linux-2.5.51-bk1/sound/pci/Makefile Sat Dec 14 12:31:38 2002
+++ linux/sound/pci/Makefile Sat Dec 14 12:38:56 2002
@@ -35,5 +35,3 @@
obj-$(CONFIG_SND_VIA82XX) += snd-via82xx.o
obj-$(CONFIG_SND) += ac97/ ali5451/ cs46xx/ emu10k1/ korg1212/ nm256/ rme9652/ trident/ ymfpci/ ice1712/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/pci/ac97/Makefile linux/sound/pci/ac97/Makefile
--- linux-2.5.51-bk1/sound/pci/ac97/Makefile Sat Dec 14 12:31:38 2002
+++ linux/sound/pci/ac97/Makefile Sat Dec 14 12:38:56 2002
@@ -26,5 +26,3 @@
obj-$(CONFIG_SND_YMFPCI) += snd-ac97-codec.o
obj-m := $(sort $(obj-m))
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/pci/ali5451/Makefile linux/sound/pci/ali5451/Makefile
--- linux-2.5.51-bk1/sound/pci/ali5451/Makefile Sun Sep 15 22:18:51 2002
+++ linux/sound/pci/ali5451/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_ALI5451) += snd-ali5451.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/pci/cs46xx/Makefile linux/sound/pci/cs46xx/Makefile
--- linux-2.5.51-bk1/sound/pci/cs46xx/Makefile Sat Dec 14 12:31:36 2002
+++ linux/sound/pci/cs46xx/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_CS46XX) += snd-cs46xx.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/pci/emu10k1/Makefile linux/sound/pci/emu10k1/Makefile
--- linux-2.5.51-bk1/sound/pci/emu10k1/Makefile Sun Sep 15 22:18:27 2002
+++ linux/sound/pci/emu10k1/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1-synth.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/pci/ice1712/Makefile linux/sound/pci/ice1712/Makefile
--- linux-2.5.51-bk1/sound/pci/ice1712/Makefile Sat Dec 14 12:31:38 2002
+++ linux/sound/pci/ice1712/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/pci/korg1212/Makefile linux/sound/pci/korg1212/Makefile
--- linux-2.5.51-bk1/sound/pci/korg1212/Makefile Sun Sep 15 22:18:29 2002
+++ linux/sound/pci/korg1212/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_KORG1212) += snd-korg1212.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/pci/nm256/Makefile linux/sound/pci/nm256/Makefile
--- linux-2.5.51-bk1/sound/pci/nm256/Makefile Sun Sep 15 22:18:30 2002
+++ linux/sound/pci/nm256/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_NM256) += snd-nm256.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/pci/rme9652/Makefile linux/sound/pci/rme9652/Makefile
--- linux-2.5.51-bk1/sound/pci/rme9652/Makefile Sun Sep 15 22:18:38 2002
+++ linux/sound/pci/rme9652/Makefile Sat Dec 14 12:38:56 2002
@@ -12,5 +12,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_RME9652) += snd-rme9652.o snd-hammerfall-mem.o
obj-$(CONFIG_SND_HDSP) += snd-hdsp.o snd-hammerfall-mem.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/pci/trident/Makefile linux/sound/pci/trident/Makefile
--- linux-2.5.51-bk1/sound/pci/trident/Makefile Sun Sep 15 22:18:21 2002
+++ linux/sound/pci/trident/Makefile Sat Dec 14 12:38:56 2002
@@ -13,5 +13,3 @@
ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
obj-$(CONFIG_SND_TRIDENT) += snd-trident-synth.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/pci/ymfpci/Makefile linux/sound/pci/ymfpci/Makefile
--- linux-2.5.51-bk1/sound/pci/ymfpci/Makefile Sun Sep 15 22:18:30 2002
+++ linux/sound/pci/ymfpci/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_YMFPCI) += snd-ymfpci.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/ppc/Makefile linux/sound/ppc/Makefile
--- linux-2.5.51-bk1/sound/ppc/Makefile Sun Sep 15 22:18:27 2002
+++ linux/sound/ppc/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/sparc/Makefile linux/sound/sparc/Makefile
--- linux-2.5.51-bk1/sound/sparc/Makefile Sat Dec 14 12:31:37 2002
+++ linux/sound/sparc/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
obj-$(CONFIG_SND_SUN_AMD7930) += snd-sun-amd7930.o
#obj-$(CONFIG_SND_SUN_DBRI) += snd-sun-dbri.o
obj-$(CONFIG_SND_SUN_CS4231) += snd-sun-cs4231.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/synth/Makefile linux/sound/synth/Makefile
--- linux-2.5.51-bk1/sound/synth/Makefile Sun Sep 15 22:18:17 2002
+++ linux/sound/synth/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
endif
obj-$(CONFIG_SND) += emux/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/synth/emux/Makefile linux/sound/synth/emux/Makefile
--- linux-2.5.51-bk1/sound/synth/emux/Makefile Sun Sep 15 22:18:29 2002
+++ linux/sound/synth/emux/Makefile Sat Dec 14 12:38:56 2002
@@ -16,5 +16,3 @@
obj-$(CONFIG_SND_SBAWE) += snd-emux-synth.o
obj-$(CONFIG_SND_EMU10K1) += snd-emux-synth.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/sound/usb/Makefile linux/sound/usb/Makefile
--- linux-2.5.51-bk1/sound/usb/Makefile Sat Dec 14 12:31:50 2002
+++ linux/sound/usb/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
# Toplevel Module Dependency
obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o
-
-include $(TOPDIR)/Rules.make
^ permalink raw reply
* [PATCH] Remove Rules.make from Makefiles (2/3)
From: Brian Gerst @ 2002-12-14 17:56 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux-Kernel, kai
[-- Attachment #1: Type: text/plain, Size: 139 bytes --]
Makefiles no longer need to include Rules.make, which is currently an
empty file. This patch removes it from the drivers tree Makefiles.
[-- Attachment #2: rules.make-drivers-1 --]
[-- Type: text/plain, Size: 48984 bytes --]
diff -urN linux-2.5.51-bk1/drivers/Makefile linux/drivers/Makefile
--- linux-2.5.51-bk1/drivers/Makefile Sat Dec 14 12:32:10 2002
+++ linux/drivers/Makefile Sat Dec 14 12:38:56 2002
@@ -44,5 +44,3 @@
obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
obj-$(CONFIG_ISDN_BOOL) += isdn/
obj-$(CONFIG_MCA) += mca/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acorn/block/Makefile linux/drivers/acorn/block/Makefile
--- linux-2.5.51-bk1/drivers/acorn/block/Makefile Sun Sep 15 22:18:28 2002
+++ linux/drivers/acorn/block/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-$(CONFIG_BLK_DEV_FD1772) += fd1772_mod.o
obj-$(CONFIG_BLK_DEV_MFM) += mfmhd_mod.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acorn/char/Makefile linux/drivers/acorn/char/Makefile
--- linux-2.5.51-bk1/drivers/acorn/char/Makefile Sat Dec 14 12:32:06 2002
+++ linux/drivers/acorn/char/Makefile Sat Dec 14 12:38:56 2002
@@ -8,8 +8,6 @@
obj-$(CONFIG_L7200_KEYB) += defkeymap-l7200.o keyb_l7200.o
obj-y += $(obj-$(MACHINE))
-include $(TOPDIR)/Rules.make
-
$(obj)/defkeymap-acorn.o: $(obj)/defkeymap-acorn.c
# Uncomment if you're changing the keymap and have an appropriate
diff -urN linux-2.5.51-bk1/drivers/acorn/net/Makefile linux/drivers/acorn/net/Makefile
--- linux-2.5.51-bk1/drivers/acorn/net/Makefile Sun Sep 15 22:18:38 2002
+++ linux/drivers/acorn/net/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-$(CONFIG_ARM_ETHERH) += etherh.o
obj-$(CONFIG_ARM_ETHER3) += ether3.o
obj-$(CONFIG_ARM_ETHER1) += ether1.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acorn/scsi/Makefile linux/drivers/acorn/scsi/Makefile
--- linux-2.5.51-bk1/drivers/acorn/scsi/Makefile Sun Sep 15 22:18:17 2002
+++ linux/drivers/acorn/scsi/Makefile Sat Dec 14 12:38:56 2002
@@ -13,5 +13,3 @@
obj-$(CONFIG_SCSI_OAK1) += oak.o
obj-$(CONFIG_SCSI_POWERTECSCSI) += powertec.o fas216.o queue.o msgqueue.o
obj-$(CONFIG_SCSI_EESOXSCSI) += eesox.o fas216.o queue.o msgqueue.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acpi/Makefile linux/drivers/acpi/Makefile
--- linux-2.5.51-bk1/drivers/acpi/Makefile Sat Dec 14 12:31:59 2002
+++ linux/drivers/acpi/Makefile Sat Dec 14 12:38:56 2002
@@ -48,5 +48,3 @@
obj-$(CONFIG_ACPI_NUMA) += numa.o
obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o
obj-$(CONFIG_ACPI_BUS) += scan.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acpi/dispatcher/Makefile linux/drivers/acpi/dispatcher/Makefile
--- linux-2.5.51-bk1/drivers/acpi/dispatcher/Makefile Sat Dec 14 12:32:10 2002
+++ linux/drivers/acpi/dispatcher/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
dsinit.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acpi/events/Makefile linux/drivers/acpi/events/Makefile
--- linux-2.5.51-bk1/drivers/acpi/events/Makefile Sat Dec 14 12:32:10 2002
+++ linux/drivers/acpi/events/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
evgpe.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acpi/executer/Makefile linux/drivers/acpi/executer/Makefile
--- linux-2.5.51-bk1/drivers/acpi/executer/Makefile Sat Dec 14 12:31:37 2002
+++ linux/drivers/acpi/executer/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
exdump.o exmutex.o exoparg3.o exresnte.o exstoren.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acpi/hardware/Makefile linux/drivers/acpi/hardware/Makefile
--- linux-2.5.51-bk1/drivers/acpi/hardware/Makefile Sat Dec 14 12:31:37 2002
+++ linux/drivers/acpi/hardware/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-y := hwacpi.o hwgpe.o hwregs.o hwsleep.o hwtimer.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acpi/namespace/Makefile linux/drivers/acpi/namespace/Makefile
--- linux-2.5.51-bk1/drivers/acpi/namespace/Makefile Sat Dec 14 12:32:10 2002
+++ linux/drivers/acpi/namespace/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
nsparse.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acpi/parser/Makefile linux/drivers/acpi/parser/Makefile
--- linux-2.5.51-bk1/drivers/acpi/parser/Makefile Sat Dec 14 12:31:37 2002
+++ linux/drivers/acpi/parser/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
psopcode.o psscope.o psutils.o psxface.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acpi/resources/Makefile linux/drivers/acpi/resources/Makefile
--- linux-2.5.51-bk1/drivers/acpi/resources/Makefile Sat Dec 14 12:31:37 2002
+++ linux/drivers/acpi/resources/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
rscalc.o rsdump.o rsirq.o rsmemory.o rsutils.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acpi/tables/Makefile linux/drivers/acpi/tables/Makefile
--- linux-2.5.51-bk1/drivers/acpi/tables/Makefile Sat Dec 14 12:31:37 2002
+++ linux/drivers/acpi/tables/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
tbgetall.o tbinstal.o tbutils.o tbxfroot.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/acpi/utilities/Makefile linux/drivers/acpi/utilities/Makefile
--- linux-2.5.51-bk1/drivers/acpi/utilities/Makefile Sat Dec 14 12:31:37 2002
+++ linux/drivers/acpi/utilities/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
utcopy.o utdelete.o utglobal.o utmath.o utobject.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/atm/Makefile linux/drivers/atm/Makefile
--- linux-2.5.51-bk1/drivers/atm/Makefile Sat Dec 14 12:31:48 2002
+++ linux/drivers/atm/Makefile Sat Dec 14 12:38:56 2002
@@ -51,8 +51,6 @@
endif
endif
-include $(TOPDIR)/Rules.make
-
# FORE Systems 200E-series firmware magic
$(obj)/fore200e_pca_fw.c: $(patsubst "%", %, $(CONFIG_ATM_FORE200E_PCA_FW)) \
$(obj)/fore200e_mkfirm
diff -urN linux-2.5.51-bk1/drivers/base/Makefile linux/drivers/base/Makefile
--- linux-2.5.51-bk1/drivers/base/Makefile Sat Dec 14 12:31:59 2002
+++ linux/drivers/base/Makefile Sat Dec 14 12:38:56 2002
@@ -12,5 +12,3 @@
export-objs := core.o power.o sys.o bus.o driver.o \
class.o intf.o platform.o firmware.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/base/fs/Makefile linux/drivers/base/fs/Makefile
--- linux-2.5.51-bk1/drivers/base/fs/Makefile Sat Dec 14 12:31:59 2002
+++ linux/drivers/base/fs/Makefile Sat Dec 14 12:38:56 2002
@@ -1,5 +1,3 @@
obj-y := device.o
export-objs := device.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/block/Makefile linux/drivers/block/Makefile
--- linux-2.5.51-bk1/drivers/block/Makefile Sat Dec 14 12:31:42 2002
+++ linux/drivers/block/Makefile Sat Dec 14 12:38:56 2002
@@ -31,5 +31,3 @@
obj-$(CONFIG_BLK_DEV_UMEM) += umem.o
obj-$(CONFIG_BLK_DEV_NBD) += nbd.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/block/paride/Makefile linux/drivers/block/paride/Makefile
--- linux-2.5.51-bk1/drivers/block/paride/Makefile Sun Sep 15 22:18:26 2002
+++ linux/drivers/block/paride/Makefile Sat Dec 14 12:38:56 2002
@@ -28,5 +28,3 @@
obj-$(CONFIG_PARIDE_PF) += pf.o
obj-$(CONFIG_PARIDE_PT) += pt.o
obj-$(CONFIG_PARIDE_PG) += pg.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/bluetooth/Makefile linux/drivers/bluetooth/Makefile
--- linux-2.5.51-bk1/drivers/bluetooth/Makefile Sat Dec 14 12:31:44 2002
+++ linux/drivers/bluetooth/Makefile Sat Dec 14 12:38:56 2002
@@ -13,5 +13,3 @@
hci_uart-$(CONFIG_BT_HCIUART_H4) += hci_h4.o
hci_uart-$(CONFIG_BT_HCIUART_BCSP) += hci_bcsp.o
hci_uart-objs := $(hci_uart-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/cdrom/Makefile linux/drivers/cdrom/Makefile
--- linux-2.5.51-bk1/drivers/cdrom/Makefile Sun Sep 15 22:18:28 2002
+++ linux/drivers/cdrom/Makefile Sat Dec 14 12:38:56 2002
@@ -36,7 +36,3 @@
obj-$(CONFIG_SBPCD) += sbpcd.o cdrom.o
obj-$(CONFIG_SJCD) += sjcd.o
obj-$(CONFIG_CDU535) += sonycd535.o
-
-# Hand off to Rules.make.
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/char/Makefile linux/drivers/char/Makefile
--- linux-2.5.51-bk1/drivers/char/Makefile Sat Dec 14 12:32:10 2002
+++ linux/drivers/char/Makefile Sat Dec 14 12:38:56 2002
@@ -87,8 +87,6 @@
# Files generated that shall be removed upon make clean
clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
-include $(TOPDIR)/Rules.make
-
$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
$(call do_cmd,CONMK $@,$(objtree)/scripts/conmakehash $< > $@)
diff -urN linux-2.5.51-bk1/drivers/char/drm/Makefile linux/drivers/char/drm/Makefile
--- linux-2.5.51-bk1/drivers/char/drm/Makefile Sat Dec 14 12:32:02 2002
+++ linux/drivers/char/drm/Makefile Sat Dec 14 12:38:56 2002
@@ -19,5 +19,3 @@
obj-$(CONFIG_DRM_I810) += i810.o
obj-$(CONFIG_DRM_I830) += i830.o
obj-$(CONFIG_DRM_FFB) += ffb.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/char/ftape/Makefile linux/drivers/char/ftape/Makefile
--- linux-2.5.51-bk1/drivers/char/ftape/Makefile Sun Sep 15 22:18:51 2002
+++ linux/drivers/char/ftape/Makefile Sat Dec 14 12:38:56 2002
@@ -26,5 +26,3 @@
obj-$(CONFIG_FTAPE) += lowlevel/
obj-$(CONFIG_ZFTAPE) += zftape/
obj-$(CONFIG_ZFT_COMPRESSOR) += compressor/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/char/ftape/compressor/Makefile linux/drivers/char/ftape/compressor/Makefile
--- linux-2.5.51-bk1/drivers/char/ftape/compressor/Makefile Sun Sep 15 22:18:26 2002
+++ linux/drivers/char/ftape/compressor/Makefile Sat Dec 14 12:38:56 2002
@@ -29,5 +29,3 @@
zft-compressor-objs := zftape-compress.o lzrw3.o
CFLAGS_lzrw3.o := -O6 -funroll-all-loops
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/char/ftape/lowlevel/Makefile linux/drivers/char/ftape/lowlevel/Makefile
--- linux-2.5.51-bk1/drivers/char/ftape/lowlevel/Makefile Sun Sep 15 22:18:25 2002
+++ linux/drivers/char/ftape/lowlevel/Makefile Sat Dec 14 12:38:56 2002
@@ -43,6 +43,3 @@
ifeq ($(CONFIG_FT_PROC_FS),y)
ftape-objs += ftape-proc.o
endif
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/char/ftape/zftape/Makefile linux/drivers/char/ftape/zftape/Makefile
--- linux-2.5.51-bk1/drivers/char/ftape/zftape/Makefile Sun Sep 15 22:18:46 2002
+++ linux/drivers/char/ftape/zftape/Makefile Sat Dec 14 12:38:56 2002
@@ -36,6 +36,3 @@
zftape-init.o zftape-buffers.o zftape_syms.o
EXTRA_CFLAGS := -DZFT_OBSOLETE
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/char/mwave/Makefile linux/drivers/char/mwave/Makefile
--- linux-2.5.51-bk1/drivers/char/mwave/Makefile Sun Sep 15 22:18:23 2002
+++ linux/drivers/char/mwave/Makefile Sat Dec 14 12:38:56 2002
@@ -13,5 +13,3 @@
# To compile in lots (~20 KiB) of run-time enablable printk()s for debugging:
EXTRA_CFLAGS += -DMW_TRACE
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/char/pcmcia/Makefile linux/drivers/char/pcmcia/Makefile
--- linux-2.5.51-bk1/drivers/char/pcmcia/Makefile Sun Sep 15 22:18:41 2002
+++ linux/drivers/char/pcmcia/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
#
obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/char/rio/Makefile linux/drivers/char/rio/Makefile
--- linux-2.5.51-bk1/drivers/char/rio/Makefile Sun Sep 15 22:18:21 2002
+++ linux/drivers/char/rio/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
rio-objs := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \
rioparam.o riopcicopy.o rioroute.o riotable.o riotty.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/char/watchdog/Makefile linux/drivers/char/watchdog/Makefile
--- linux-2.5.51-bk1/drivers/char/watchdog/Makefile Sat Dec 14 12:32:07 2002
+++ linux/drivers/char/watchdog/Makefile Sat Dec 14 12:38:56 2002
@@ -23,5 +23,3 @@
obj-$(CONFIG_SH_WDT) += shwdt.o
obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/dio/Makefile linux/drivers/dio/Makefile
--- linux-2.5.51-bk1/drivers/dio/Makefile Sun Sep 15 22:18:24 2002
+++ linux/drivers/dio/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := dio.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/fc4/Makefile linux/drivers/fc4/Makefile
--- linux-2.5.51-bk1/drivers/fc4/Makefile Sun Sep 15 22:18:28 2002
+++ linux/drivers/fc4/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
obj-$(CONFIG_FC4) += fc4.o
obj-$(CONFIG_FC4_SOC) += soc.o
obj-$(CONFIG_FC4_SOCAL) += socal.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/hotplug/Makefile linux/drivers/hotplug/Makefile
--- linux-2.5.51-bk1/drivers/hotplug/Makefile Sat Dec 14 12:32:11 2002
+++ linux/drivers/hotplug/Makefile Sat Dec 14 12:38:56 2002
@@ -45,6 +45,3 @@
ifeq ($(CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM),y)
cpqphp-objs += cpqphp_nvram.o
endif
-
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/i2c/Makefile linux/drivers/i2c/Makefile
--- linux-2.5.51-bk1/drivers/i2c/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/i2c/Makefile Sat Dec 14 12:38:56 2002
@@ -21,6 +21,3 @@
# This is needed for automatic patch generation: sensors code starts here
# This is needed for automatic patch generation: sensors code ends here
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/ide/Makefile linux/drivers/ide/Makefile
--- linux-2.5.51-bk1/drivers/ide/Makefile Sat Dec 14 12:32:07 2002
+++ linux/drivers/ide/Makefile Sat Dec 14 12:38:56 2002
@@ -30,5 +30,3 @@
endif
obj-$(CONFIG_BLK_DEV_IDE) += legacy/ ppc/ arm/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/ide/arm/Makefile linux/drivers/ide/arm/Makefile
--- linux-2.5.51-bk1/drivers/ide/arm/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/ide/arm/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o
EXTRA_CFLAGS := -Idrivers/ide
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/ide/legacy/Makefile linux/drivers/ide/legacy/Makefile
--- linux-2.5.51-bk1/drivers/ide/legacy/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/ide/legacy/Makefile Sat Dec 14 12:38:56 2002
@@ -18,5 +18,3 @@
obj-$(CONFIG_BLK_DEV_HD) += hd.o
EXTRA_CFLAGS := -Idrivers/ide
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/ide/pci/Makefile linux/drivers/ide/pci/Makefile
--- linux-2.5.51-bk1/drivers/ide/pci/Makefile Sat Dec 14 12:32:07 2002
+++ linux/drivers/ide/pci/Makefile Sat Dec 14 12:38:56 2002
@@ -34,5 +34,3 @@
obj-$(CONFIG_BLK_DEV_GENERIC) += generic.o
EXTRA_CFLAGS := -Idrivers/ide
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/ide/ppc/Makefile linux/drivers/ide/ppc/Makefile
--- linux-2.5.51-bk1/drivers/ide/ppc/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/ide/ppc/Makefile Sat Dec 14 12:38:56 2002
@@ -4,5 +4,3 @@
obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o
EXTRA_CFLAGS := -Idrivers/ide
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/ieee1394/Makefile linux/drivers/ieee1394/Makefile
--- linux-2.5.51-bk1/drivers/ieee1394/Makefile Sat Dec 14 12:31:33 2002
+++ linux/drivers/ieee1394/Makefile Sat Dec 14 12:38:56 2002
@@ -17,5 +17,3 @@
obj-$(CONFIG_IEEE1394_ETH1394) += eth1394.o
obj-$(CONFIG_IEEE1394_AMDTP) += amdtp.o
obj-$(CONFIG_IEEE1394_CMP) += cmp.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/input/Makefile linux/drivers/input/Makefile
--- linux-2.5.51-bk1/drivers/input/Makefile Sun Sep 15 22:18:55 2002
+++ linux/drivers/input/Makefile Sat Dec 14 12:38:56 2002
@@ -21,7 +21,3 @@
obj-$(CONFIG_INPUT_JOYSTICK) += joystick/
obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/
obj-$(CONFIG_INPUT_MISC) += misc/
-
-# The global Rules.make.
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/input/gameport/Makefile linux/drivers/input/gameport/Makefile
--- linux-2.5.51-bk1/drivers/input/gameport/Makefile Sun Sep 15 22:18:16 2002
+++ linux/drivers/input/gameport/Makefile Sat Dec 14 12:38:56 2002
@@ -15,7 +15,3 @@
obj-$(CONFIG_GAMEPORT_L4) += lightning.o
obj-$(CONFIG_GAMEPORT_NS558) += ns558.o
obj-$(CONFIG_GAMEPORT_VORTEX) += vortex.o
-
-# The global Rules.make.
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/input/joystick/Makefile linux/drivers/input/joystick/Makefile
--- linux-2.5.51-bk1/drivers/input/joystick/Makefile Sun Sep 15 22:18:43 2002
+++ linux/drivers/input/joystick/Makefile Sat Dec 14 12:38:56 2002
@@ -28,7 +28,3 @@
obj-$(CONFIG_JOYSTICK_WARRIOR) += warrior.o
obj-$(CONFIG_JOYSTICK_IFORCE) += iforce/
-
-# The global Rules.make.
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/input/joystick/iforce/Makefile linux/drivers/input/joystick/iforce/Makefile
--- linux-2.5.51-bk1/drivers/input/joystick/iforce/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/input/joystick/iforce/Makefile Sat Dec 14 12:38:56 2002
@@ -18,7 +18,3 @@
endif
EXTRA_CFLAGS = -Werror-implicit-function-declaration
-
-# The global Rules.make.
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/input/keyboard/Makefile linux/drivers/input/keyboard/Makefile
--- linux-2.5.51-bk1/drivers/input/keyboard/Makefile Sun Sep 15 22:18:27 2002
+++ linux/drivers/input/keyboard/Makefile Sat Dec 14 12:38:56 2002
@@ -10,7 +10,3 @@
obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o
obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o
obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o
-
-# The global Rules.make.
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/input/mouse/Makefile linux/drivers/input/mouse/Makefile
--- linux-2.5.51-bk1/drivers/input/mouse/Makefile Sat Dec 14 12:32:01 2002
+++ linux/drivers/input/mouse/Makefile Sat Dec 14 12:38:56 2002
@@ -12,7 +12,3 @@
obj-$(CONFIG_MOUSE_PC110PAD) += pc110pad.o
obj-$(CONFIG_MOUSE_PS2) += psmouse.o
obj-$(CONFIG_MOUSE_SERIAL) += sermouse.o
-
-# The global Rules.make.
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/input/serio/Makefile linux/drivers/input/serio/Makefile
--- linux-2.5.51-bk1/drivers/input/serio/Makefile Sun Sep 15 22:18:18 2002
+++ linux/drivers/input/serio/Makefile Sat Dec 14 12:38:56 2002
@@ -17,7 +17,3 @@
obj-$(CONFIG_SERIO_SA1111) += sa1111ps2.o
obj-$(CONFIG_SERIO_AMBAKMI) += ambakmi.o
obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o
-
-# The global Rules.make.
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/input/touchscreen/Makefile linux/drivers/input/touchscreen/Makefile
--- linux-2.5.51-bk1/drivers/input/touchscreen/Makefile Sun Sep 15 22:18:52 2002
+++ linux/drivers/input/touchscreen/Makefile Sat Dec 14 12:38:56 2002
@@ -6,7 +6,3 @@
obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o
obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o
-
-# The global Rules.make.
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/macintosh/Makefile linux/drivers/macintosh/Makefile
--- linux-2.5.51-bk1/drivers/macintosh/Makefile Sat Dec 14 12:32:01 2002
+++ linux/drivers/macintosh/Makefile Sat Dec 14 12:38:56 2002
@@ -34,8 +34,3 @@
obj-$(CONFIG_ADB_IOP) += adb-iop.o
obj-$(CONFIG_ADB_PMU68K) += via-pmu68k.o
obj-$(CONFIG_ADB_MACIO) += macio-adb.o
-
-# The global Rules.make.
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/mca/Makefile linux/drivers/mca/Makefile
--- linux-2.5.51-bk1/drivers/mca/Makefile Sat Dec 14 12:32:11 2002
+++ linux/drivers/mca/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-$(CONFIG_MCA_LEGACY) += mca-legacy.o
export-objs := mca-bus.o mca-legacy.o mca-proc.o mca-driver.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/md/Makefile linux/drivers/md/Makefile
--- linux-2.5.51-bk1/drivers/md/Makefile Sat Dec 14 12:31:48 2002
+++ linux/drivers/md/Makefile Sat Dec 14 12:38:56 2002
@@ -18,6 +18,3 @@
obj-$(CONFIG_MD_MULTIPATH) += multipath.o
obj-$(CONFIG_BLK_DEV_MD) += md.o
obj-$(CONFIG_BLK_DEV_DM) += dm-mod.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/media/Makefile linux/drivers/media/Makefile
--- linux-2.5.51-bk1/drivers/media/Makefile Sat Dec 14 12:31:48 2002
+++ linux/drivers/media/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := video/ radio/ dvb/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/media/dvb/Makefile linux/drivers/media/dvb/Makefile
--- linux-2.5.51-bk1/drivers/media/dvb/Makefile Sat Dec 14 12:31:48 2002
+++ linux/drivers/media/dvb/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := dvb-core/ frontends/ av7110/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/media/dvb/av7110/Makefile linux/drivers/media/dvb/av7110/Makefile
--- linux-2.5.51-bk1/drivers/media/dvb/av7110/Makefile Sat Dec 14 12:32:07 2002
+++ linux/drivers/media/dvb/av7110/Makefile Sat Dec 14 12:38:56 2002
@@ -7,6 +7,3 @@
obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o
EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/media/dvb/dvb-core/Makefile linux/drivers/media/dvb/dvb-core/Makefile
--- linux-2.5.51-bk1/drivers/media/dvb/dvb-core/Makefile Sat Dec 14 12:31:48 2002
+++ linux/drivers/media/dvb/dvb-core/Makefile Sat Dec 14 12:38:56 2002
@@ -8,6 +8,3 @@
dvb_frontend.o dvb_i2c.o dvb_net.o dvb_ksyms.o
obj-$(CONFIG_DVB_CORE) += dvb-core.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/media/dvb/frontends/Makefile linux/drivers/media/dvb/frontends/Makefile
--- linux-2.5.51-bk1/drivers/media/dvb/frontends/Makefile Sat Dec 14 12:32:07 2002
+++ linux/drivers/media/dvb/frontends/Makefile Sat Dec 14 12:38:56 2002
@@ -11,6 +11,3 @@
obj-$(CONFIG_DVB_GRUNDIG_29504_491) += grundig_29504-491.o
obj-$(CONFIG_DVB_GRUNDIG_29504_401) += grundig_29504-401.o
obj-$(CONFIG_DVB_VES1820) += ves1820.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/media/radio/Makefile linux/drivers/media/radio/Makefile
--- linux-2.5.51-bk1/drivers/media/radio/Makefile Sun Sep 15 22:18:30 2002
+++ linux/drivers/media/radio/Makefile Sat Dec 14 12:38:56 2002
@@ -24,5 +24,3 @@
obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o
obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/media/video/Makefile linux/drivers/media/video/Makefile
--- linux-2.5.51-bk1/drivers/media/video/Makefile Sat Dec 14 12:32:11 2002
+++ linux/drivers/media/video/Makefile Sat Dec 14 12:38:56 2002
@@ -37,5 +37,3 @@
obj-$(CONFIG_VIDEO_MEYE) += meye.o
obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ tuner.o tda9887.o video-buf.o
obj-$(CONFIG_TUNER_3036) += tuner-3036.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/media/video/saa7134/Makefile linux/drivers/media/video/saa7134/Makefile
--- linux-2.5.51-bk1/drivers/media/video/saa7134/Makefile Sat Dec 14 12:31:59 2002
+++ linux/drivers/media/video/saa7134/Makefile Sat Dec 14 12:38:56 2002
@@ -6,6 +6,3 @@
obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o
EXTRA_CFLAGS = -I$(src)/..
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/message/Makefile linux/drivers/message/Makefile
--- linux-2.5.51-bk1/drivers/message/Makefile Sun Sep 15 22:18:52 2002
+++ linux/drivers/message/Makefile Sat Dec 14 12:38:56 2002
@@ -4,6 +4,3 @@
obj-$(CONFIG_I2O) += i2o/
obj-$(CONFIG_FUSION) += fusion/
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/message/fusion/Makefile linux/drivers/message/fusion/Makefile
--- linux-2.5.51-bk1/drivers/message/fusion/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/message/fusion/Makefile Sat Dec 14 12:38:56 2002
@@ -52,5 +52,3 @@
obj-$(CONFIG_FUSION_ISENSE) += isense.o
obj-$(CONFIG_FUSION_CTL) += mptctl.o
obj-$(CONFIG_FUSION_LAN) += mptlan.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/message/i2o/Makefile linux/drivers/message/i2o/Makefile
--- linux-2.5.51-bk1/drivers/message/i2o/Makefile Sun Sep 15 22:18:21 2002
+++ linux/drivers/message/i2o/Makefile Sat Dec 14 12:38:56 2002
@@ -13,6 +13,3 @@
obj-$(CONFIG_I2O_LAN) += i2o_lan.o
obj-$(CONFIG_I2O_SCSI) += i2o_scsi.o
obj-$(CONFIG_I2O_PROC) += i2o_proc.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/misc/Makefile linux/drivers/misc/Makefile
--- linux-2.5.51-bk1/drivers/misc/Makefile Sat Dec 14 12:32:11 2002
+++ linux/drivers/misc/Makefile Sat Dec 14 12:38:56 2002
@@ -2,4 +2,3 @@
# Makefile for misc devices that really don't fit anywhere else.
#
obj- := misc.o # Dummy rule to force built-in.o to be made
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/mtd/Makefile linux/drivers/mtd/Makefile
--- linux-2.5.51-bk1/drivers/mtd/Makefile Sat Dec 14 12:31:42 2002
+++ linux/drivers/mtd/Makefile Sat Dec 14 12:38:56 2002
@@ -40,5 +40,3 @@
obj-$(CONFIG_NFTL) += nftl.o
nftl-objs := nftlcore.o nftlmount.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/mtd/chips/Makefile linux/drivers/mtd/chips/Makefile
--- linux-2.5.51-bk1/drivers/mtd/chips/Makefile Sun Sep 15 22:18:24 2002
+++ linux/drivers/mtd/chips/Makefile Sat Dec 14 12:38:56 2002
@@ -25,5 +25,3 @@
obj-$(CONFIG_MTD_ROM) += map_rom.o
obj-$(CONFIG_MTD_SHARP) += sharp.o
obj-$(CONFIG_MTD_ABSENT) += map_absent.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/mtd/devices/Makefile linux/drivers/mtd/devices/Makefile
--- linux-2.5.51-bk1/drivers/mtd/devices/Makefile Sun Sep 15 22:18:16 2002
+++ linux/drivers/mtd/devices/Makefile Sat Dec 14 12:38:56 2002
@@ -19,5 +19,3 @@
obj-$(CONFIG_MTD_MTDRAM) += mtdram.o
obj-$(CONFIG_MTD_LART) += lart.o
obj-$(CONFIG_MTD_BLKMTD) += blkmtd.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/mtd/maps/Makefile linux/drivers/mtd/maps/Makefile
--- linux-2.5.51-bk1/drivers/mtd/maps/Makefile Sat Dec 14 12:31:59 2002
+++ linux/drivers/mtd/maps/Makefile Sat Dec 14 12:38:56 2002
@@ -37,5 +37,3 @@
obj-$(CONFIG_MTD_EDB7312) += edb7312.o
obj-$(CONFIG_MTD_IMPA7) += impa7.o
obj-$(CONFIG_MTD_FORTUNET) += fortunet.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/mtd/nand/Makefile linux/drivers/mtd/nand/Makefile
--- linux-2.5.51-bk1/drivers/mtd/nand/Makefile Sun Sep 15 22:18:17 2002
+++ linux/drivers/mtd/nand/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
obj-$(CONFIG_MTD_NAND) += $(nandobjs-y)
obj-$(CONFIG_MTD_NAND_SPIA) += spia.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/net/Makefile linux/drivers/net/Makefile
--- linux-2.5.51-bk1/drivers/net/Makefile Sat Dec 14 12:32:11 2002
+++ linux/drivers/net/Makefile Sat Dec 14 12:38:56 2002
@@ -198,6 +198,3 @@
obj-$(CONFIG_NET_TULIP) += tulip/
obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/net/appletalk/Makefile linux/drivers/net/appletalk/Makefile
--- linux-2.5.51-bk1/drivers/net/appletalk/Makefile Sun Sep 15 22:18:18 2002
+++ linux/drivers/net/appletalk/Makefile Sat Dec 14 12:38:56 2002
@@ -7,6 +7,3 @@
obj-$(CONFIG_IPDDP) += ipddp.o
obj-$(CONFIG_COPS) += cops.o
obj-$(CONFIG_LTPC) += ltpc.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/net/arcnet/Makefile linux/drivers/net/arcnet/Makefile
--- linux-2.5.51-bk1/drivers/net/arcnet/Makefile Sun Sep 15 22:18:21 2002
+++ linux/drivers/net/arcnet/Makefile Sat Dec 14 12:38:56 2002
@@ -13,5 +13,3 @@
obj-$(CONFIG_ARCNET_COM20020) += com20020.o
obj-$(CONFIG_ARCNET_COM20020_ISA) += com20020-isa.o
obj-$(CONFIG_ARCNET_COM20020_PCI) += com20020-pci.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/net/e100/Makefile linux/drivers/net/e100/Makefile
--- linux-2.5.51-bk1/drivers/net/e100/Makefile Sun Sep 15 22:18:53 2002
+++ linux/drivers/net/e100/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
e100-objs := e100_main.o e100_config.o e100_proc.o e100_phy.o \
e100_eeprom.o e100_test.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/net/e1000/Makefile linux/drivers/net/e1000/Makefile
--- linux-2.5.51-bk1/drivers/net/e1000/Makefile Sun Sep 15 22:18:18 2002
+++ linux/drivers/net/e1000/Makefile Sat Dec 14 12:38:56 2002
@@ -34,5 +34,3 @@
e1000-objs := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o \
e1000_proc.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/net/fc/Makefile linux/drivers/net/fc/Makefile
--- linux-2.5.51-bk1/drivers/net/fc/Makefile Sun Sep 15 22:18:24 2002
+++ linux/drivers/net/fc/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
#
obj-$(CONFIG_IPHASE5526) += iph5526.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/net/hamradio/Makefile linux/drivers/net/hamradio/Makefile
--- linux-2.5.51-bk1/drivers/net/hamradio/Makefile Sat Dec 14 12:32:07 2002
+++ linux/drivers/net/hamradio/Makefile Sat Dec 14 12:38:56 2002
@@ -22,5 +22,3 @@
obj-$(CONFIG_BAYCOM_SER_HDX) += baycom_ser_hdx.o hdlcdrv.o
obj-$(CONFIG_BAYCOM_PAR) += baycom_par.o hdlcdrv.o
obj-$(CONFIG_BAYCOM_EPP) += baycom_epp.o hdlcdrv.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/net/irda/Makefile linux/drivers/net/irda/Makefile
--- linux-2.5.51-bk1/drivers/net/irda/Makefile Sat Dec 14 12:32:01 2002
+++ linux/drivers/net/irda/Makefile Sat Dec 14 12:38:56 2002
@@ -40,5 +40,3 @@
# The SIR helper module
sir-dev-objs := sir_core.o sir_dev.o sir_dongle.o sir_kthread.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/net/pcmcia/Makefile linux/drivers/net/pcmcia/Makefile
--- linux-2.5.51-bk1/drivers/net/pcmcia/Makefile Sun Sep 15 22:18:16 2002
+++ linux/drivers/net/pcmcia/Makefile Sat Dec 14 12:38:56 2002
@@ -21,5 +21,3 @@
obj-$(CONFIG_AIRONET4500_CS) += aironet4500_cs.o
obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/net/sk98lin/Makefile linux/drivers/net/sk98lin/Makefile
--- linux-2.5.51-bk1/drivers/net/sk98lin/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/net/sk98lin/Makefile Sat Dec 14 12:38:56 2002
@@ -56,6 +56,3 @@
# SK_DBGCAT_DRV_EVENT 0x08000000 driver events
EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_USE_CSUM $(DBGDEF)
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/net/skfp/Makefile linux/drivers/net/skfp/Makefile
--- linux-2.5.51-bk1/drivers/net/skfp/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/net/skfp/Makefile Sat Dec 14 12:38:56 2002
@@ -18,6 +18,3 @@
# thus simplify fixes to it), please do not clean it up!
EXTRA_CFLAGS += -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/net/tokenring/Makefile linux/drivers/net/tokenring/Makefile
--- linux-2.5.51-bk1/drivers/net/tokenring/Makefile Sun Sep 15 22:18:21 2002
+++ linux/drivers/net/tokenring/Makefile Sat Dec 14 12:38:56 2002
@@ -14,5 +14,3 @@
obj-$(CONFIG_TMSISA) += tmsisa.o
obj-$(CONFIG_SMCTR) += smctr.o
obj-$(CONFIG_3C359) += 3c359.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/net/tulip/Makefile linux/drivers/net/tulip/Makefile
--- linux-2.5.51-bk1/drivers/net/tulip/Makefile Sun Sep 15 22:18:53 2002
+++ linux/drivers/net/tulip/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
tulip-objs := eeprom.o interrupt.o media.o \
timer.o tulip_core.o \
21142.o pnic.o pnic2.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/net/wan/Makefile linux/drivers/net/wan/Makefile
--- linux-2.5.51-bk1/drivers/net/wan/Makefile Sun Sep 15 22:18:30 2002
+++ linux/drivers/net/wan/Makefile Sat Dec 14 12:38:56 2002
@@ -68,5 +68,3 @@
endif
obj-$(CONFIG_N2) += n2.o
obj-$(CONFIG_C101) += c101.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/net/wan/lmc/Makefile linux/drivers/net/wan/lmc/Makefile
--- linux-2.5.51-bk1/drivers/net/wan/lmc/Makefile Sat Dec 14 12:31:36 2002
+++ linux/drivers/net/wan/lmc/Makefile Sat Dec 14 12:38:56 2002
@@ -15,6 +15,3 @@
# -DLMC_PACKET_LOG
EXTRA_CFLAGS += -I. $(DBGDEF)
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/net/wireless/Makefile linux/drivers/net/wireless/Makefile
--- linux-2.5.51-bk1/drivers/net/wireless/Makefile Sun Sep 15 22:18:29 2002
+++ linux/drivers/net/wireless/Makefile Sat Dec 14 12:38:56 2002
@@ -18,5 +18,3 @@
obj-$(CONFIG_AIRO) += airo.o
obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/nubus/Makefile linux/drivers/nubus/Makefile
--- linux-2.5.51-bk1/drivers/nubus/Makefile Sun Sep 15 22:18:54 2002
+++ linux/drivers/nubus/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
obj-$(CONFIG_MODULES) += nubus_syms.o
obj-$(CONFIG_PROC_FS) += proc.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/parport/Makefile linux/drivers/parport/Makefile
--- linux-2.5.51-bk1/drivers/parport/Makefile Sun Sep 15 22:18:17 2002
+++ linux/drivers/parport/Makefile Sat Dec 14 12:38:56 2002
@@ -19,5 +19,3 @@
obj-$(CONFIG_PARPORT_ATARI) += parport_atari.o
obj-$(CONFIG_PARPORT_SUNBPP) += parport_sunbpp.o
obj-$(CONFIG_PARPORT_GSC) += parport_gsc.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/pci/Makefile linux/drivers/pci/Makefile
--- linux-2.5.51-bk1/drivers/pci/Makefile Sat Dec 14 12:32:04 2002
+++ linux/drivers/pci/Makefile Sat Dec 14 12:38:56 2002
@@ -39,8 +39,6 @@
# Files generated that shall be removed upon make clean
clean-files := devlist.h classlist.h
-include $(TOPDIR)/Rules.make
-
# Dependencies on generated files need to be listed explicitly
$(obj)/names.o: $(obj)/devlist.h $(obj)/classlist.h
diff -urN linux-2.5.51-bk1/drivers/pcmcia/Makefile linux/drivers/pcmcia/Makefile
--- linux-2.5.51-bk1/drivers/pcmcia/Makefile Sat Dec 14 12:31:36 2002
+++ linux/drivers/pcmcia/Makefile Sat Dec 14 12:38:56 2002
@@ -47,5 +47,3 @@
sa1100_cs-objs-$(CONFIG_SA1100_TRIZEPS) += sa1100_trizeps.o
sa1100_cs-objs-$(CONFIG_SA1100_YOPY) += sa1100_yopy.o
sa1100_cs-objs := $(sa1100_cs-objs-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/pnp/Makefile linux/drivers/pnp/Makefile
--- linux-2.5.51-bk1/drivers/pnp/Makefile Sat Dec 14 12:32:11 2002
+++ linux/drivers/pnp/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
obj-$(CONFIG_ISAPNP) += isapnp/
export-objs := core.o driver.o resource.o $(pnp-card-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/pnp/isapnp/Makefile linux/drivers/pnp/isapnp/Makefile
--- linux-2.5.51-bk1/drivers/pnp/isapnp/Makefile Sat Dec 14 12:32:11 2002
+++ linux/drivers/pnp/isapnp/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
isapnp-proc-$(CONFIG_PROC_FS) = proc.o
obj-y := core.o $(isapnp-proc-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/pnp/pnpbios/Makefile linux/drivers/pnp/pnpbios/Makefile
--- linux-2.5.51-bk1/drivers/pnp/pnpbios/Makefile Sat Dec 14 12:31:44 2002
+++ linux/drivers/pnp/pnpbios/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
pnpbios-proc-$(CONFIG_PROC_FS) = proc.o
obj-y := core.o $(pnpbios-proc-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/s390/Makefile linux/drivers/s390/Makefile
--- linux-2.5.51-bk1/drivers/s390/Makefile Sat Dec 14 12:32:11 2002
+++ linux/drivers/s390/Makefile Sat Dec 14 12:38:56 2002
@@ -6,6 +6,3 @@
obj-y += cio/ block/ char/ misc/ net/
drivers-y += drivers/s390/built-in.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/s390/block/Makefile linux/drivers/s390/block/Makefile
--- linux-2.5.51-bk1/drivers/s390/block/Makefile Sat Dec 14 12:32:04 2002
+++ linux/drivers/s390/block/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o
obj-$(CONFIG_DASD_FBA) += dasd_fba_mod.o
obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/s390/char/Makefile linux/drivers/s390/char/Makefile
--- linux-2.5.51-bk1/drivers/s390/char/Makefile Sat Dec 14 12:32:12 2002
+++ linux/drivers/s390/char/Makefile Sat Dec 14 12:38:56 2002
@@ -20,5 +20,3 @@
tape-objs := tape_core.o tape_std.o tape_char.o $(tape-y)
obj-$(CONFIG_S390_TAPE) += tape.o
obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/s390/cio/Makefile linux/drivers/s390/cio/Makefile
--- linux-2.5.51-bk1/drivers/s390/cio/Makefile Sat Dec 14 12:32:12 2002
+++ linux/drivers/s390/cio/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
obj-$(CONFIG_QDIO) += qdio.o
export-objs += qdio.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/s390/misc/Makefile linux/drivers/s390/misc/Makefile
--- linux-2.5.51-bk1/drivers/s390/misc/Makefile Sat Dec 14 12:32:12 2002
+++ linux/drivers/s390/misc/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
# placeholder for stuff to come...
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/s390/net/Makefile linux/drivers/s390/net/Makefile
--- linux-2.5.51-bk1/drivers/s390/net/Makefile Sat Dec 14 12:32:12 2002
+++ linux/drivers/s390/net/Makefile Sat Dec 14 12:38:56 2002
@@ -10,6 +10,3 @@
obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o
obj-$(CONFIG_IUCV) += netiucv.o
obj-$(CONFIG_LCS) += lcs.o cu3088.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/sbus/Makefile linux/drivers/sbus/Makefile
--- linux-2.5.51-bk1/drivers/sbus/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/sbus/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
endif
obj-$(CONFIG_SBUSCHAR) += char/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/sbus/char/Makefile linux/drivers/sbus/char/Makefile
--- linux-2.5.51-bk1/drivers/sbus/char/Makefile Sun Sep 15 22:18:50 2002
+++ linux/drivers/sbus/char/Makefile Sat Dec 14 12:38:56 2002
@@ -25,5 +25,3 @@
obj-$(CONFIG_TADPOLE_TS102_UCTRL) += uctrl.o
obj-$(CONFIG_SUN_JSFLASH) += jsflash.o
obj-$(CONFIG_BBC_I2C) += bbc.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/scsi/Makefile linux/drivers/scsi/Makefile
--- linux-2.5.51-bk1/drivers/scsi/Makefile Sat Dec 14 12:32:12 2002
+++ linux/drivers/scsi/Makefile Sat Dec 14 12:38:56 2002
@@ -141,8 +141,6 @@
clean-files := 53c8xx_d.h 53c7xx_d.h sim710_d.h 53c700_d.h \
53c8xx_u.h 53c7xx_u.h sim710_u.h 53c700_u.h
-include $(TOPDIR)/Rules.make
-
$(obj)/53c7,8xx.o: $(obj)/53c8xx_d.h $(obj)/53c8xx_u.h
$(obj)/53c7xx.o: $(obj)/53c7xx_d.h $(obj)/53c7xx_u.h
$(obj)/sim710.o: $(obj)/sim710_d.h
diff -urN linux-2.5.51-bk1/drivers/scsi/aacraid/Makefile linux/drivers/scsi/aacraid/Makefile
--- linux-2.5.51-bk1/drivers/scsi/aacraid/Makefile Sat Dec 14 12:31:42 2002
+++ linux/drivers/scsi/aacraid/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
dpcsup.o rx.o sa.o
EXTRA_CFLAGS := -Idrivers/scsi
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/scsi/pcmcia/Makefile linux/drivers/scsi/pcmcia/Makefile
--- linux-2.5.51-bk1/drivers/scsi/pcmcia/Makefile Sun Sep 15 22:18:28 2002
+++ linux/drivers/scsi/pcmcia/Makefile Sat Dec 14 12:38:56 2002
@@ -22,5 +22,3 @@
aha152x_cs-objs := aha152x_stub.o aha152x.o
fdomain_cs-objs := fdomain_stub.o fdomain.o
qlogic_cs-objs := qlogic_stub.o qlogicfas.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/scsi/sym53c8xx_2/Makefile linux/drivers/scsi/sym53c8xx_2/Makefile
--- linux-2.5.51-bk1/drivers/scsi/sym53c8xx_2/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/scsi/sym53c8xx_2/Makefile Sat Dec 14 12:38:56 2002
@@ -2,6 +2,3 @@
sym53c8xx-objs := sym_fw.o sym_glue.o sym_hipd.o sym_malloc.o sym_misc.o sym_nvram.o
obj-$(CONFIG_SCSI_SYM53C8XX_2) := sym53c8xx.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/serial/Makefile linux/drivers/serial/Makefile
--- linux-2.5.51-bk1/drivers/serial/Makefile Sat Dec 14 12:32:12 2002
+++ linux/drivers/serial/Makefile Sat Dec 14 12:38:56 2002
@@ -29,5 +29,3 @@
obj-$(CONFIG_SERIAL_68360) += 68360serial.o
obj-$(CONFIG_SERIAL_COLDFIRE) += mcfserial.o
obj-$(CONFIG_V850E_NB85E_UART) += nb85e_uart.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/sgi/Makefile linux/drivers/sgi/Makefile
--- linux-2.5.51-bk1/drivers/sgi/Makefile Sun Sep 15 22:18:25 2002
+++ linux/drivers/sgi/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
subdir-m += char
obj-y += char/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/sgi/char/Makefile linux/drivers/sgi/char/Makefile
--- linux-2.5.51-bk1/drivers/sgi/char/Makefile Sun Sep 15 22:18:17 2002
+++ linux/drivers/sgi/char/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
obj-$(CONFIG_SGI_SERIAL) += sgiserial.o
obj-$(CONFIG_SGI_DS1286) += ds1286.o
obj-$(CONFIG_SGI_NEWPORT_GFX) += graphics.o rrm.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/tc/Makefile linux/drivers/tc/Makefile
--- linux-2.5.51-bk1/drivers/tc/Makefile Sun Sep 15 22:18:24 2002
+++ linux/drivers/tc/Makefile Sat Dec 14 12:38:56 2002
@@ -13,8 +13,6 @@
obj-$(CONFIG_ZS) += zs.o
obj-$(CONFIG_VT) += lk201.o lk201-map.o lk201-remap.o
-include $(TOPDIR)/Rules.make
-
$(obj)/lk201-map.o: $(obj)/lk201-map.c
# Uncomment if you're changing the keymap and have an appropriate
diff -urN linux-2.5.51-bk1/drivers/telephony/Makefile linux/drivers/telephony/Makefile
--- linux-2.5.51-bk1/drivers/telephony/Makefile Sun Sep 15 22:18:30 2002
+++ linux/drivers/telephony/Makefile Sat Dec 14 12:38:56 2002
@@ -7,6 +7,3 @@
obj-$(CONFIG_PHONE) += phonedev.o
obj-$(CONFIG_PHONE_IXJ) += ixj.o
obj-$(CONFIG_PHONE_IXJ_PCMCIA) += ixj_pcmcia.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/usb/Makefile linux/drivers/usb/Makefile
--- linux-2.5.51-bk1/drivers/usb/Makefile Sat Dec 14 12:32:03 2002
+++ linux/drivers/usb/Makefile Sat Dec 14 12:38:56 2002
@@ -58,5 +58,3 @@
obj-$(CONFIG_USB_TEST) += misc/
obj-$(CONFIG_USB_TIGL) += misc/
obj-$(CONFIG_USB_USS720) += misc/
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/usb/class/Makefile linux/drivers/usb/class/Makefile
--- linux-2.5.51-bk1/drivers/usb/class/Makefile Sun Sep 15 22:18:28 2002
+++ linux/drivers/usb/class/Makefile Sat Dec 14 12:38:56 2002
@@ -8,6 +8,3 @@
obj-$(CONFIG_USB_BLUETOOTH_TTY) += bluetty.o
obj-$(CONFIG_USB_MIDI) += usb-midi.o
obj-$(CONFIG_USB_PRINTER) += usblp.o
-
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/usb/core/Makefile linux/drivers/usb/core/Makefile
--- linux-2.5.51-bk1/drivers/usb/core/Makefile Sat Dec 14 12:31:36 2002
+++ linux/drivers/usb/core/Makefile Sat Dec 14 12:38:56 2002
@@ -16,5 +16,3 @@
endif
obj-$(CONFIG_USB) += usbcore.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/usb/host/Makefile linux/drivers/usb/host/Makefile
--- linux-2.5.51-bk1/drivers/usb/host/Makefile Sat Dec 14 12:32:03 2002
+++ linux/drivers/usb/host/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o
obj-$(CONFIG_USB_SL811HS) += hc_sl811.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/usb/image/Makefile linux/drivers/usb/image/Makefile
--- linux-2.5.51-bk1/drivers/usb/image/Makefile Sun Sep 15 22:18:16 2002
+++ linux/drivers/usb/image/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-$(CONFIG_USB_HPUSBSCSI) += hpusbscsi.o
obj-$(CONFIG_USB_MICROTEK) += microtek.o
obj-$(CONFIG_USB_SCANNER) += scanner.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/usb/input/Makefile linux/drivers/usb/input/Makefile
--- linux-2.5.51-bk1/drivers/usb/input/Makefile Sun Sep 15 22:18:37 2002
+++ linux/drivers/usb/input/Makefile Sat Dec 14 12:38:56 2002
@@ -30,5 +30,3 @@
obj-$(CONFIG_USB_WACOM) += wacom.o
obj-$(CONFIG_USB_POWERMATE) += powermate.o
obj-$(CONFIG_USB_XPAD) += xpad.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/usb/media/Makefile linux/drivers/usb/media/Makefile
--- linux-2.5.51-bk1/drivers/usb/media/Makefile Sat Dec 14 12:31:42 2002
+++ linux/drivers/usb/media/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
obj-$(CONFIG_USB_SE401) += se401.o
obj-$(CONFIG_USB_STV680) += stv680.o
obj-$(CONFIG_USB_VICAM) += vicam.o usbvideo.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/usb/misc/Makefile linux/drivers/usb/misc/Makefile
--- linux-2.5.51-bk1/drivers/usb/misc/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/usb/misc/Makefile Sat Dec 14 12:38:56 2002
@@ -14,5 +14,3 @@
obj-$(CONFIG_USB_TEST) += usbtest.o
obj-$(CONFIG_USB_TIGL) += tiglusb.o
obj-$(CONFIG_USB_USS720) += uss720.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/usb/net/Makefile linux/drivers/usb/net/Makefile
--- linux-2.5.51-bk1/drivers/usb/net/Makefile Sun Sep 15 22:18:18 2002
+++ linux/drivers/usb/net/Makefile Sat Dec 14 12:38:56 2002
@@ -8,6 +8,3 @@
obj-$(CONFIG_USB_PEGASUS) += pegasus.o
obj-$(CONFIG_USB_RTL8150) += rtl8150.o
obj-$(CONFIG_USB_USBNET) += usbnet.o
-
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/usb/serial/Makefile linux/drivers/usb/serial/Makefile
--- linux-2.5.51-bk1/drivers/usb/serial/Makefile Sat Dec 14 12:32:38 2002
+++ linux/drivers/usb/serial/Makefile Sat Dec 14 12:39:38 2002
@@ -34,6 +34,3 @@
export-objs := usb-serial.o ezusb.o
usbserial-objs := usb-serial.o generic.o bus.o $(usbserial-obj-y)
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/usb/storage/Makefile linux/drivers/usb/storage/Makefile
--- linux-2.5.51-bk1/drivers/usb/storage/Makefile Sat Dec 14 12:31:38 2002
+++ linux/drivers/usb/storage/Makefile Sat Dec 14 12:38:56 2002
@@ -21,5 +21,3 @@
usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \
initializers.o $(usb-storage-obj-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/video/Makefile linux/drivers/video/Makefile
--- linux-2.5.51-bk1/drivers/video/Makefile Sat Dec 14 12:32:12 2002
+++ linux/drivers/video/Makefile Sat Dec 14 12:38:56 2002
@@ -88,8 +88,6 @@
# Files generated that shall be removed upon make clean
clean-files := promcon_tbl.c
-include $(TOPDIR)/Rules.make
-
$(obj)/promcon_tbl.c: $(src)/prom.uni
$(objtree)/scripts/conmakehash $< | \
sed -e '/#include <[^>]*>/p' -e 's/types/init/' \
diff -urN linux-2.5.51-bk1/drivers/video/aty/Makefile linux/drivers/video/aty/Makefile
--- linux-2.5.51-bk1/drivers/video/aty/Makefile Sun Sep 15 22:18:25 2002
+++ linux/drivers/video/aty/Makefile Sat Dec 14 12:38:56 2002
@@ -4,6 +4,3 @@
atyfb-$(CONFIG_FB_ATY_GX) += mach64_gx.o
atyfb-$(CONFIG_FB_ATY_CT) += mach64_ct.o mach64_cursor.o
atyfb-objs := $(atyfb-y)
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/video/console/Makefile linux/drivers/video/console/Makefile
--- linux-2.5.51-bk1/drivers/video/console/Makefile Sat Dec 14 12:32:12 2002
+++ linux/drivers/video/console/Makefile Sat Dec 14 12:38:56 2002
@@ -52,8 +52,6 @@
# Files generated that shall be removed upon make clean
clean-files := promcon_tbl.c
-include $(TOPDIR)/Rules.make
-
$(obj)/promcon_tbl.c: $(src)/prom.uni
$(objtree)/scripts/conmakehash $< | \
sed -e '/#include <[^>]*>/p' -e 's/types/init/' \
diff -urN linux-2.5.51-bk1/drivers/video/matrox/Makefile linux/drivers/video/matrox/Makefile
--- linux-2.5.51-bk1/drivers/video/matrox/Makefile Sat Dec 14 12:31:36 2002
+++ linux/drivers/video/matrox/Makefile Sat Dec 14 12:38:56 2002
@@ -15,6 +15,3 @@
obj-$(CONFIG_FB_MATROX) += matroxfb_base.o matroxfb_accel.o matroxfb_DAC1064.o matroxfb_Ti3026.o matroxfb_misc.o $(my-obj-y)
obj-$(CONFIG_FB_MATROX_I2C) += i2c-matroxfb.o
obj-$(CONFIG_FB_MATROX_MAVEN) += matroxfb_maven.o matroxfb_crtc2.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/drivers/video/riva/Makefile linux/drivers/video/riva/Makefile
--- linux-2.5.51-bk1/drivers/video/riva/Makefile Sat Dec 14 12:32:13 2002
+++ linux/drivers/video/riva/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-$(CONFIG_FB_RIVA) += rivafb.o
rivafb-objs := fbdev.o riva_hw.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/drivers/video/sis/Makefile linux/drivers/video/sis/Makefile
--- linux-2.5.51-bk1/drivers/video/sis/Makefile Sat Dec 14 12:32:13 2002
+++ linux/drivers/video/sis/Makefile Sat Dec 14 12:39:21 2002
@@ -7,7 +7,3 @@
obj-$(CONFIG_FB_SIS) += sisfb.o
sisfb-objs := sis_main.o sis_accel.o init.o init301.o
-
-include $(TOPDIR)/Rules.make
-
-
diff -urN linux-2.5.51-bk1/drivers/zorro/Makefile linux/drivers/zorro/Makefile
--- linux-2.5.51-bk1/drivers/zorro/Makefile Sat Dec 14 12:31:44 2002
+++ linux/drivers/zorro/Makefile Sat Dec 14 12:38:56 2002
@@ -12,8 +12,6 @@
# Files generated that shall be removed upon make clean
clean-files := devlist.h
-include $(TOPDIR)/Rules.make
-
# Dependencies on generated files need to be listed explicitly
$(obj)/names.o: $(obj)/devlist.h
^ permalink raw reply
* [PATCH] Remove Rules.make from Makefiles (1/3)
From: Brian Gerst @ 2002-12-14 17:56 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux-Kernel, kai
[-- Attachment #1: Type: text/plain, Size: 136 bytes --]
Makefiles no longer need to include Rules.make, which is currently an
empty file. This patch removes it from the arch tree Makefiles.
[-- Attachment #2: rules.make-arch-1 --]
[-- Type: text/plain, Size: 72081 bytes --]
diff -urN linux-2.5.51-bk1/arch/alpha/kernel/Makefile linux/arch/alpha/kernel/Makefile
--- linux-2.5.51-bk1/arch/alpha/kernel/Makefile Sat Dec 14 12:32:04 2002
+++ linux/arch/alpha/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -92,5 +92,3 @@
endif
endif # GENERIC
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/alpha/lib/Makefile linux/arch/alpha/lib/Makefile
--- linux-2.5.51-bk1/arch/alpha/lib/Makefile Sat Dec 14 12:31:40 2002
+++ linux/arch/alpha/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -49,8 +49,6 @@
obj-$(CONFIG_SMP) += dec_and_lock.o
-include $(TOPDIR)/Rules.make
-
$(obj)/__divqu.o: $(obj)/$(ev6)divide.S
$(CC) $(AFLAGS) -DDIV -c -o $(obj)/__divqu.o $(obj)/$(ev6)divide.S
diff -urN linux-2.5.51-bk1/arch/alpha/math-emu/Makefile linux/arch/alpha/math-emu/Makefile
--- linux-2.5.51-bk1/arch/alpha/math-emu/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/alpha/math-emu/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
CFLAGS += -I. -I$(TOPDIR)/include/math-emu -w
obj-$(CONFIG_MATHEMU) += math.o qrnnd.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/alpha/mm/Makefile linux/arch/alpha/mm/Makefile
--- linux-2.5.51-bk1/arch/alpha/mm/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/alpha/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-y := init.o fault.o extable.o
obj-$(CONFIG_DISCONTIGMEM) += numa.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/kernel/Makefile linux/arch/arm/kernel/Makefile
--- linux-2.5.51-bk1/arch/arm/kernel/Makefile Sat Dec 14 12:32:04 2002
+++ linux/arch/arm/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -40,8 +40,6 @@
EXTRA_TARGETS := $(head-y) init_task.o
-include $(TOPDIR)/Rules.make
-
# Spell out some dependencies that `make dep' doesn't spot
$(obj)/entry-armv.o: $(obj)/entry-header.S include/asm-arm/constants.h
$(obj)/entry-armo.o: $(obj)/entry-header.S include/asm-arm/constants.h
diff -urN linux-2.5.51-bk1/arch/arm/lib/Makefile linux/arch/arm/lib/Makefile
--- linux-2.5.51-bk1/arch/arm/lib/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/arm/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -41,8 +41,6 @@
obj-$(CONFIG_CPU_26) += uaccess-armo.o
-include $(TOPDIR)/Rules.make
-
$(obj)/csumpartialcopy.o: $(obj)/csumpartialcopygeneric.S
$(obj)/csumpartialcopyuser.o: $(obj)/csumpartialcopygeneric.S
diff -urN linux-2.5.51-bk1/arch/arm/mach-adifcc/Makefile linux/arch/arm/mach-adifcc/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-adifcc/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-adifcc/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
obj- :=
export-objs :=
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-anakin/Makefile linux/arch/arm/mach-anakin/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-anakin/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-anakin/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
obj- :=
export-objs :=
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-arc/Makefile linux/arch/arm/mach-arc/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-arc/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-arc/Makefile Sat Dec 14 12:38:56 2002
@@ -17,5 +17,3 @@
EXTRA_TARGETS := head.o
AFLAGS_head.o := -DTEXTADDR=$(TEXTADDR)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-clps711x/Makefile linux/arch/arm/mach-clps711x/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-clps711x/Makefile Sat Dec 14 12:31:36 2002
+++ linux/arch/arm/mach-clps711x/Makefile Sat Dec 14 12:38:56 2002
@@ -18,5 +18,3 @@
obj-$(CONFIG_ARCH_P720T) += p720t.o
leds-$(CONFIG_ARCH_P720T) += p720t-leds.o
obj-$(CONFIG_LEDS) += $(leds-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-clps7500/Makefile linux/arch/arm/mach-clps7500/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-clps7500/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-clps7500/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
obj- :=
export-objs :=
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-ebsa110/Makefile linux/arch/arm/mach-ebsa110/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-ebsa110/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-ebsa110/Makefile Sat Dec 14 12:38:56 2002
@@ -12,5 +12,3 @@
export-objs := io.o
obj-$(CONFIG_LEDS) += leds.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-epxa10db/Makefile linux/arch/arm/mach-epxa10db/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-epxa10db/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-epxa10db/Makefile Sat Dec 14 12:38:56 2002
@@ -10,6 +10,3 @@
obj- :=
export-objs :=
-
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-footbridge/Makefile linux/arch/arm/mach-footbridge/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-footbridge/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-footbridge/Makefile Sat Dec 14 12:38:56 2002
@@ -25,5 +25,3 @@
obj-$(CONFIG_PCI) +=$(pci-y)
obj-$(CONFIG_LEDS) +=$(leds-y)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-ftvpci/Makefile linux/arch/arm/mach-ftvpci/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-ftvpci/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-ftvpci/Makefile Sat Dec 14 12:38:56 2002
@@ -13,5 +13,3 @@
obj-$(CONFIG_PCI) += pci.o
obj-$(CONFIG_LEDS) += leds.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-integrator/Makefile linux/arch/arm/mach-integrator/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-integrator/Makefile Sat Dec 14 12:31:36 2002
+++ linux/arch/arm/mach-integrator/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
obj-$(CONFIG_LEDS) += leds.o
obj-$(CONFIG_PCI) += pci_v3.o pci.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-iop310/Makefile linux/arch/arm/mach-iop310/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-iop310/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-iop310/Makefile Sat Dec 14 12:38:56 2002
@@ -22,5 +22,3 @@
obj-$(CONFIG_IOP310_DMA) += dma.o
obj-$(CONFIG_IOP310_MU) += message.o
obj-$(CONFIG_IOP310_PMON) += pmon.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-l7200/Makefile linux/arch/arm/mach-l7200/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-l7200/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-l7200/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
obj- :=
export-objs :=
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-pxa/Makefile linux/arch/arm/mach-pxa/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-pxa/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-pxa/Makefile Sat Dec 14 12:38:56 2002
@@ -21,5 +21,3 @@
# Misc features
obj-$(CONFIG_PM) += pm.o sleep.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-rpc/Makefile linux/arch/arm/mach-rpc/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-rpc/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-rpc/Makefile Sat Dec 14 12:38:56 2002
@@ -10,6 +10,3 @@
obj- :=
export-objs :=
-
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-sa1100/Makefile linux/arch/arm/mach-sa1100/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-sa1100/Makefile Sat Dec 14 12:31:42 2002
+++ linux/arch/arm/mach-sa1100/Makefile Sat Dec 14 12:38:56 2002
@@ -108,5 +108,3 @@
# Miscelaneous functions
obj-$(CONFIG_PM) += pm.o sleep.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-shark/Makefile linux/arch/arm/mach-shark/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-shark/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-shark/Makefile Sat Dec 14 12:38:56 2002
@@ -12,5 +12,3 @@
export-objs :=
obj-$(CONFIG_LEDS) += leds.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mach-tbox/Makefile linux/arch/arm/mach-tbox/Makefile
--- linux-2.5.51-bk1/arch/arm/mach-tbox/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/mach-tbox/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
obj- :=
export-objs :=
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/mm/Makefile linux/arch/arm/mm/Makefile
--- linux-2.5.51-bk1/arch/arm/mm/Makefile Sat Dec 14 12:32:02 2002
+++ linux/arch/arm/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -38,5 +38,3 @@
p-$(CONFIG_CPU_XSCALE) += proc-xscale.o tlb-v4wbi.o copypage-xscale.o abort-xscale.o minicache.o
obj-y += $(sort $(p-y))
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/arm/nwfpe/Makefile linux/arch/arm/nwfpe/Makefile
--- linux-2.5.51-bk1/arch/arm/nwfpe/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/arm/nwfpe/Makefile Sat Dec 14 12:38:56 2002
@@ -17,5 +17,3 @@
else
nwfpe-objs += entry.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/cris/drivers/Makefile linux/arch/cris/drivers/Makefile
--- linux-2.5.51-bk1/arch/cris/drivers/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/cris/drivers/Makefile Sat Dec 14 12:38:56 2002
@@ -14,6 +14,3 @@
obj-$(CONFIG_ETRAX_PARPORT) += parport.o
obj-$(CONFIG_ETRAX_DS1302) += ds1302.o
obj-$(CONFIG_ETRAX_ETHERNET_LPSLAVE) += lpslave
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/cris/drivers/lpslave/Makefile linux/arch/cris/drivers/lpslave/Makefile
--- linux-2.5.51-bk1/arch/cris/drivers/lpslave/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/cris/drivers/lpslave/Makefile Sat Dec 14 12:38:56 2002
@@ -4,8 +4,6 @@
obj-y = e100lpslavenet.o e100lpslave_code.o
-include $(TOPDIR)/Rules.make
-
e100lpslave_code.o: e100lpslave.o e100lpslaveld
$(CROSS_COMPILE)ld -qmagic -Te100lpslaveld e100lpslave.o -o e100lpslave
$(CROSS_COMPILE)objcopy -O binary --remove-section=.data --remove-section=.bss e100lpslave e100lpslave.text
diff -urN linux-2.5.51-bk1/arch/cris/kernel/Makefile linux/arch/cris/kernel/Makefile
--- linux-2.5.51-bk1/arch/cris/kernel/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/cris/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -21,5 +21,3 @@
$(CC) $(CFLAGS) -S -c $<
clean:
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/cris/lib/Makefile linux/arch/cris/lib/Makefile
--- linux-2.5.51-bk1/arch/cris/lib/Makefile Sun Sep 15 22:18:41 2002
+++ linux/arch/cris/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
EXTRA_AFLAGS := -traditional
obj-y = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/cris/mm/Makefile linux/arch/cris/mm/Makefile
--- linux-2.5.51-bk1/arch/cris/mm/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/cris/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := init.o fault.o tlb.o extable.o ioremap.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/i386/boot/compressed/Makefile linux/arch/i386/boot/compressed/Makefile
--- linux-2.5.51-bk1/arch/i386/boot/compressed/Makefile Sat Dec 14 12:32:10 2002
+++ linux/arch/i386/boot/compressed/Makefile Sat Dec 14 12:38:56 2002
@@ -7,8 +7,6 @@
EXTRA_TARGETS := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
EXTRA_AFLAGS := -traditional
-include $(TOPDIR)/Rules.make
-
LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup_32
$(obj)/vmlinux: $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
diff -urN linux-2.5.51-bk1/arch/i386/kernel/Makefile linux/arch/i386/kernel/Makefile
--- linux-2.5.51-bk1/arch/i386/kernel/Makefile Sat Dec 14 12:32:02 2002
+++ linux/arch/i386/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -34,5 +34,3 @@
export-objs += scx200.o
obj-$(CONFIG_SCx200) += scx200.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/i386/kernel/cpu/Makefile linux/arch/i386/kernel/cpu/Makefile
--- linux-2.5.51-bk1/arch/i386/kernel/cpu/Makefile Sat Dec 14 12:32:00 2002
+++ linux/arch/i386/kernel/cpu/Makefile Sat Dec 14 12:38:56 2002
@@ -17,6 +17,3 @@
obj-$(CONFIG_MTRR) += mtrr/
obj-$(CONFIG_CPU_FREQ) += cpufreq/
-
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/i386/kernel/cpu/cpufreq/Makefile linux/arch/i386/kernel/cpu/cpufreq/Makefile
--- linux-2.5.51-bk1/arch/i386/kernel/cpu/cpufreq/Makefile Sat Dec 14 12:31:36 2002
+++ linux/arch/i386/kernel/cpu/cpufreq/Makefile Sat Dec 14 12:38:56 2002
@@ -4,5 +4,3 @@
obj-$(CONFIG_X86_P4_CLOCKMOD) += p4-clockmod.o
obj-$(CONFIG_ELAN_CPUFREQ) += elanfreq.o
obj-$(CONFIG_X86_LONGRUN) += longrun.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/i386/kernel/cpu/mcheck/Makefile linux/arch/i386/kernel/cpu/mcheck/Makefile
--- linux-2.5.51-bk1/arch/i386/kernel/cpu/mcheck/Makefile Sat Dec 14 12:32:00 2002
+++ linux/arch/i386/kernel/cpu/mcheck/Makefile Sat Dec 14 12:38:56 2002
@@ -1,5 +1,2 @@
obj-y = mce.o k7.o p4.o p5.o p6.o winchip.o
obj-$(CONFIG_X86_MCE_NONFATAL) += non-fatal.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/i386/kernel/cpu/mtrr/Makefile linux/arch/i386/kernel/cpu/mtrr/Makefile
--- linux-2.5.51-bk1/arch/i386/kernel/cpu/mtrr/Makefile Sun Sep 15 22:18:17 2002
+++ linux/arch/i386/kernel/cpu/mtrr/Makefile Sat Dec 14 12:38:56 2002
@@ -4,5 +4,3 @@
obj-y += centaur.o
export-objs := main.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/i386/kernel/timers/Makefile linux/arch/i386/kernel/timers/Makefile
--- linux-2.5.51-bk1/arch/i386/kernel/timers/Makefile Sat Dec 14 12:31:40 2002
+++ linux/arch/i386/kernel/timers/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-y += timer_tsc.o
obj-y += timer_pit.o
obj-$(CONFIG_X86_CYCLONE) += timer_cyclone.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/i386/lib/Makefile linux/arch/i386/lib/Makefile
--- linux-2.5.51-bk1/arch/i386/lib/Makefile Sat Dec 14 12:31:44 2002
+++ linux/arch/i386/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
obj-$(CONFIG_X86_USE_3DNOW) += mmx.o
obj-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
obj-$(CONFIG_DEBUG_IOVIRT) += iodebug.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/i386/mach-generic/Makefile linux/arch/i386/mach-generic/Makefile
--- linux-2.5.51-bk1/arch/i386/mach-generic/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/i386/mach-generic/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
EXTRA_CFLAGS += -I../kernel
obj-y := setup.o topology.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/i386/mach-visws/Makefile linux/arch/i386/mach-visws/Makefile
--- linux-2.5.51-bk1/arch/i386/mach-visws/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/i386/mach-visws/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
obj-$(CONFIG_PCI) += pci-visws.o
obj-$(CONFIG_X86_VISWS_APIC) += visws_apic.o
obj-$(CONFIG_X86_LOCAL_APIC) += mpparse.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/i386/mach-voyager/Makefile linux/arch/i386/mach-voyager/Makefile
--- linux-2.5.51-bk1/arch/i386/mach-voyager/Makefile Sat Dec 14 12:31:47 2002
+++ linux/arch/i386/mach-voyager/Makefile Sat Dec 14 12:38:56 2002
@@ -13,5 +13,3 @@
obj-y := setup.o voyager_basic.o voyager_thread.o
obj-$(CONFIG_SMP) += voyager_smp.o voyager_cat.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/i386/math-emu/Makefile linux/arch/i386/math-emu/Makefile
--- linux-2.5.51-bk1/arch/i386/math-emu/Makefile Sat Dec 14 12:31:33 2002
+++ linux/arch/i386/math-emu/Makefile Sat Dec 14 12:38:56 2002
@@ -26,7 +26,5 @@
obj-y =$(C_OBJS) $(A_OBJS)
-include $(TOPDIR)/Rules.make
-
proto:
cproto -e -DMAKING_PROTO *.c >fpu_proto.h
diff -urN linux-2.5.51-bk1/arch/i386/mm/Makefile linux/arch/i386/mm/Makefile
--- linux-2.5.51-bk1/arch/i386/mm/Makefile Sat Dec 14 12:31:44 2002
+++ linux/arch/i386/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
obj-$(CONFIG_DISCONTIGMEM) += discontig.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
obj-$(CONFIG_HIGHMEM) += highmem.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/i386/pci/Makefile linux/arch/i386/pci/Makefile
--- linux-2.5.51-bk1/arch/i386/pci/Makefile Sat Dec 14 12:31:48 2002
+++ linux/arch/i386/pci/Makefile Sat Dec 14 12:38:56 2002
@@ -16,5 +16,3 @@
endif # CONFIG_X86_NUMAQ
obj-y += irq.o common.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/dig/Makefile linux/arch/ia64/dig/Makefile
--- linux-2.5.51-bk1/arch/ia64/dig/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ia64/dig/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-y := setup.o
obj-$(CONFIG_IA64_GENERIC) += machvec.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/hp/common/Makefile linux/arch/ia64/hp/common/Makefile
--- linux-2.5.51-bk1/arch/ia64/hp/common/Makefile Sat Dec 14 12:31:33 2002
+++ linux/arch/ia64/hp/common/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
export-objs := sba_iommu.o
obj-y := sba_iommu.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/hp/sim/Makefile linux/arch/ia64/hp/sim/Makefile
--- linux-2.5.51-bk1/arch/ia64/hp/sim/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ia64/hp/sim/Makefile Sat Dec 14 12:38:56 2002
@@ -13,5 +13,3 @@
obj-$(CONFIG_HP_SIMETH) += simeth.o
obj-$(CONFIG_HP_SIMSERIAL) += simserial.o
obj-$(CONFIG_HP_SIMSCSI) += simscsi.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/hp/zx1/Makefile linux/arch/ia64/hp/zx1/Makefile
--- linux-2.5.51-bk1/arch/ia64/hp/zx1/Makefile Sat Dec 14 12:31:33 2002
+++ linux/arch/ia64/hp/zx1/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-y := hpzx1_misc.o
obj-$(CONFIG_IA64_GENERIC) += hpzx1_machvec.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/ia32/Makefile linux/arch/ia64/ia32/Makefile
--- linux-2.5.51-bk1/arch/ia64/ia32/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ia64/ia32/Makefile Sat Dec 14 12:38:56 2002
@@ -4,5 +4,3 @@
obj-y := ia32_entry.o sys_ia32.o ia32_ioctl.o ia32_signal.o ia32_support.o ia32_traps.o \
binfmt_elf32.o ia32_ldt.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/kernel/Makefile linux/arch/ia64/kernel/Makefile
--- linux-2.5.51-bk1/arch/ia64/kernel/Makefile Sat Dec 14 12:31:33 2002
+++ linux/arch/ia64/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
obj-$(CONFIG_SMP) += smp.o smpboot.o
obj-$(CONFIG_IA64_MCA) += mca.o mca_asm.o
obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/lib/Makefile linux/arch/ia64/lib/Makefile
--- linux-2.5.51-bk1/arch/ia64/lib/Makefile Sat Dec 14 12:31:48 2002
+++ linux/arch/ia64/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -20,8 +20,6 @@
IGNORE_FLAGS_OBJS = __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o \
__divdi3.o __udivdi3.o __moddi3.o __umoddi3.o
-include $(TOPDIR)/Rules.make
-
AFLAGS___divdi3.o =
AFLAGS___udivdi3.o = -DUNSIGNED
AFLAGS___moddi3.o = -DMODULO
diff -urN linux-2.5.51-bk1/arch/ia64/mm/Makefile linux/arch/ia64/mm/Makefile
--- linux-2.5.51-bk1/arch/ia64/mm/Makefile Sat Dec 14 12:31:48 2002
+++ linux/arch/ia64/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
obj-$(CONFIG_NUMA) += numa.o
obj-$(CONFIG_DISCONTIGMEM) += discontig.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/pci/Makefile linux/arch/ia64/pci/Makefile
--- linux-2.5.51-bk1/arch/ia64/pci/Makefile Sat Dec 14 12:31:33 2002
+++ linux/arch/ia64/pci/Makefile Sat Dec 14 12:38:56 2002
@@ -1,3 +1 @@
obj-y := pci.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/sn/fakeprom/Makefile linux/arch/ia64/sn/fakeprom/Makefile
--- linux-2.5.51-bk1/arch/ia64/sn/fakeprom/Makefile Sun Sep 15 22:18:52 2002
+++ linux/arch/ia64/sn/fakeprom/Makefile Sat Dec 14 12:38:56 2002
@@ -18,7 +18,3 @@
clean:
rm -f *.o fprom
-
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/ia64/sn/io/Makefile linux/arch/ia64/sn/io/Makefile
--- linux-2.5.51-bk1/arch/ia64/sn/io/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ia64/sn/io/Makefile Sat Dec 14 12:38:56 2002
@@ -37,5 +37,3 @@
sn2/pcibr/pcibr_rrb.o sn2/pcibr/pcibr_slot.o
obj-$(CONFIG_PCIBA) += pciba.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/sn/kernel/Makefile linux/arch/ia64/sn/kernel/Makefile
--- linux-2.5.51-bk1/arch/ia64/sn/kernel/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ia64/sn/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -41,6 +41,3 @@
obj-$(CONFIG_IA64_SGI_AUTOTEST) += llsc4.o misctest.o
obj-$(CONFIG_IA64_GENERIC) += machvec.o
obj-$(CONFIG_MODULES) += sn_ksyms.o
-
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/sn/kernel/sn1/Makefile linux/arch/ia64/sn/kernel/sn1/Makefile
--- linux-2.5.51-bk1/arch/ia64/sn/kernel/sn1/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ia64/sn/kernel/sn1/Makefile Sat Dec 14 12:38:56 2002
@@ -35,5 +35,3 @@
obj-y := cache.o error.o iomv.o synergy.o sn1_smp.o
EXTRA_CFLAGS := -DLITTLE_ENDIAN
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ia64/sn/kernel/sn2/Makefile linux/arch/ia64/sn/kernel/sn2/Makefile
--- linux-2.5.51-bk1/arch/ia64/sn/kernel/sn2/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ia64/sn/kernel/sn2/Makefile Sat Dec 14 12:38:56 2002
@@ -35,6 +35,3 @@
obj-y := cache.o iomv.o sn2_smp.o
EXTRA_CFLAGS := -DLITTLE_ENDIAN
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/m68k/amiga/Makefile linux/arch/m68k/amiga/Makefile
--- linux-2.5.51-bk1/arch/m68k/amiga/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/amiga/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-y := config.o amiints.o cia.o chipram.o amisound.o amiga_ksyms.o
obj-$(CONFIG_AMIGA_PCMCIA) += pcmcia.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/apollo/Makefile linux/arch/m68k/apollo/Makefile
--- linux-2.5.51-bk1/arch/m68k/apollo/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/apollo/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := config.o dn_ints.o dma.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/atari/Makefile linux/arch/m68k/atari/Makefile
--- linux-2.5.51-bk1/arch/m68k/atari/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68k/atari/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
ifeq ($(CONFIG_PCI),y)
obj-$(CONFIG_HADES) += hades-pci.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/bvme6000/Makefile linux/arch/m68k/bvme6000/Makefile
--- linux-2.5.51-bk1/arch/m68k/bvme6000/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/bvme6000/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := config.o bvmeints.o rtc.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/fpsp040/Makefile linux/arch/m68k/fpsp040/Makefile
--- linux-2.5.51-bk1/arch/m68k/fpsp040/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/fpsp040/Makefile Sat Dec 14 12:38:56 2002
@@ -13,6 +13,4 @@
EXTRA_AFLAGS := -traditional
EXTRA_LDFLAGS := -x
-include $(TOPDIR)/Rules.make
-
$(OS_OBJS): fpsp.h
diff -urN linux-2.5.51-bk1/arch/m68k/hp300/Makefile linux/arch/m68k/hp300/Makefile
--- linux-2.5.51-bk1/arch/m68k/hp300/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68k/hp300/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := ksyms.o config.o ints.o time.o reboot.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/ifpsp060/Makefile linux/arch/m68k/ifpsp060/Makefile
--- linux-2.5.51-bk1/arch/m68k/ifpsp060/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/ifpsp060/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
EXTRA_AFLAGS := -traditional
EXTRA_LDFLAGS := -x
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/kernel/Makefile linux/arch/m68k/kernel/Makefile
--- linux-2.5.51-bk1/arch/m68k/kernel/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68k/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -17,8 +17,6 @@
EXTRA_AFLAGS := -traditional
-include $(TOPDIR)/Rules.make
-
$(obj)/head.o: $(obj)/head.S $(obj)/m68k_defs.h
$(obj)/entry.o: $(obj)/entry.S $(obj)/m68k_defs.h
diff -urN linux-2.5.51-bk1/arch/m68k/lib/Makefile linux/arch/m68k/lib/Makefile
--- linux-2.5.51-bk1/arch/m68k/lib/Makefile Sun Sep 15 22:18:15 2002
+++ linux/arch/m68k/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
obj-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
checksum.o memcmp.o memcpy.o memset.o semaphore.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/mac/Makefile linux/arch/m68k/mac/Makefile
--- linux-2.5.51-bk1/arch/m68k/mac/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/mac/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-y := config.o bootparse.o macints.o iop.o via.o oss.o psc.o \
baboon.o macboing.o debug.o misc.o mac_ksyms.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/math-emu/Makefile linux/arch/m68k/math-emu/Makefile
--- linux-2.5.51-bk1/arch/m68k/math-emu/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/math-emu/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
obj-y := fp_entry.o fp_scan.o fp_util.o fp_move.o fp_movem.o \
fp_cond.o fp_arith.o fp_log.o fp_trig.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/mm/Makefile linux/arch/m68k/mm/Makefile
--- linux-2.5.51-bk1/arch/m68k/mm/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68k/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -9,6 +9,3 @@
else
obj-y += sun3kmap.o sun3mmu.o
endif
-
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/mvme147/Makefile linux/arch/m68k/mvme147/Makefile
--- linux-2.5.51-bk1/arch/m68k/mvme147/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/mvme147/Makefile Sat Dec 14 12:38:56 2002
@@ -3,6 +3,3 @@
#
obj-y := config.o 147ints.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/m68k/mvme16x/Makefile linux/arch/m68k/mvme16x/Makefile
--- linux-2.5.51-bk1/arch/m68k/mvme16x/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/mvme16x/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
export-objs := mvme16x_ksyms.o
obj-y := config.o 16xints.o rtc.o mvme16x_ksyms.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/q40/Makefile linux/arch/m68k/q40/Makefile
--- linux-2.5.51-bk1/arch/m68k/q40/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/q40/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := config.o q40ints.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/sun3/Makefile linux/arch/m68k/sun3/Makefile
--- linux-2.5.51-bk1/arch/m68k/sun3/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68k/sun3/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
obj-$(CONFIG_SUN3) += config.o mmu_emu.o leds.o dvma.o \
intersil.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/sun3/prom/Makefile linux/arch/m68k/sun3/prom/Makefile
--- linux-2.5.51-bk1/arch/m68k/sun3/prom/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/sun3/prom/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-y := init.o console.o printf.o misc.o
#bootstr.o init.o misc.o segment.o console.o printf.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68k/sun3x/Makefile linux/arch/m68k/sun3x/Makefile
--- linux-2.5.51-bk1/arch/m68k/sun3x/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/m68k/sun3x/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
export-objs := sun3x_ksyms.o
obj-y := config.o time.o dvma.o prom.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68knommu/Makefile linux/arch/m68knommu/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/Makefile Sat Dec 14 12:32:10 2002
+++ linux/arch/m68knommu/Makefile Sat Dec 14 12:38:56 2002
@@ -96,8 +96,6 @@
arch/m68knommu/platform/$(PLATFORM)/
libs-y += arch/m68knommu/lib/
-include $(TOPDIR)/Rules.make
-
prepare: include/asm-$(ARCH)/asm-offsets.h
archmrproper:
diff -urN linux-2.5.51-bk1/arch/m68knommu/kernel/Makefile linux/arch/m68knommu/kernel/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/kernel/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -8,6 +8,3 @@
setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o
obj-$(CONFIG_COMEMPCI) += comempci.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/m68knommu/lib/Makefile linux/arch/m68knommu/lib/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/lib/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-y := ashldi3.o ashrdi3.o lshrdi3.o \
muldi3.o mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \
checksum.o semaphore.o memcpy.o memset.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68knommu/mm/Makefile linux/arch/m68knommu/mm/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/mm/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y += init.o fault.o memory.o kmap.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/m68knommu/platform/5206/Makefile linux/arch/m68knommu/platform/5206/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/platform/5206/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/platform/5206/Makefile Sat Dec 14 12:38:56 2002
@@ -19,6 +19,3 @@
obj-y := config.o
EXTRA_TARGETS := $(BOARD)/crt0_$(MODEL).o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/m68knommu/platform/5206e/Makefile linux/arch/m68knommu/platform/5206e/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/platform/5206e/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/platform/5206e/Makefile Sat Dec 14 12:38:56 2002
@@ -19,6 +19,3 @@
obj-y := config.o
EXTRA_TARGETS := $(BOARD)/crt0_$(MODEL).o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/m68knommu/platform/5249/Makefile linux/arch/m68knommu/platform/5249/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/platform/5249/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/platform/5249/Makefile Sat Dec 14 12:38:56 2002
@@ -19,6 +19,3 @@
obj-y := config.o
EXTRA_TARGETS := $(BOARD)/crt0_$(MODEL).o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/m68knommu/platform/5272/Makefile linux/arch/m68knommu/platform/5272/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/platform/5272/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/platform/5272/Makefile Sat Dec 14 12:38:56 2002
@@ -19,6 +19,3 @@
obj-y := config.o
EXTRA_TARGETS := $(BOARD)/crt0_$(MODEL).o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/m68knommu/platform/5307/Makefile linux/arch/m68knommu/platform/5307/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/platform/5307/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/platform/5307/Makefile Sat Dec 14 12:38:56 2002
@@ -22,6 +22,3 @@
ifeq ($(CONFIG_M5307),y)
EXTRA_TARGETS := $(BOARD)/crt0_$(MODEL).o
endif
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/m68knommu/platform/5407/Makefile linux/arch/m68knommu/platform/5407/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/platform/5407/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/platform/5407/Makefile Sat Dec 14 12:38:56 2002
@@ -19,6 +19,3 @@
obj-y := config.o
EXTRA_TARGETS := $(BOARD)/crt0_$(MODEL).o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/m68knommu/platform/68328/Makefile linux/arch/m68knommu/platform/68328/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/platform/68328/Makefile Sat Dec 14 12:32:10 2002
+++ linux/arch/m68knommu/platform/68328/Makefile Sat Dec 14 12:38:56 2002
@@ -10,8 +10,6 @@
EXTRA_TARGETS := $(BOARD)/bootlogo.rh $(BOARD)/crt0_$(MODEL).o
endif
-include $(TOPDIR)/Rules.make
-
$(obj)/$(BOARD)/bootlogo.rh: $(src)/bootlogo.h
perl $(src)/bootlogo.pl < $(src)/bootlogo.h > $(obj)/$(BOARD)/bootlogo.rh
diff -urN linux-2.5.51-bk1/arch/m68knommu/platform/68360/Makefile linux/arch/m68knommu/platform/68360/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/platform/68360/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/platform/68360/Makefile Sat Dec 14 12:38:56 2002
@@ -5,6 +5,3 @@
obj-y := config.o commproc.o entry.o ints.o
EXTRA_TARGETS := $(BOARD)/crt0_$(MODEL).o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/m68knommu/platform/68EZ328/Makefile linux/arch/m68knommu/platform/68EZ328/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/platform/68EZ328/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/platform/68EZ328/Makefile Sat Dec 14 12:38:56 2002
@@ -6,8 +6,6 @@
EXTRA_TARGETS := $(BOARD)/bootlogo.rh $(BOARD)/crt0_$(MODEL).o
-include $(TOPDIR)/Rules.make
-
$(obj)/$(BOARD)/bootlogo.rh: $(src)/bootlogo.h
perl $(src)/../68328/bootlogo.pl < $(src)/bootlogo.h \
> $(obj)/$(BOARD)/bootlogo.rh
diff -urN linux-2.5.51-bk1/arch/m68knommu/platform/68VZ328/Makefile linux/arch/m68knommu/platform/68VZ328/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/platform/68VZ328/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/platform/68VZ328/Makefile Sat Dec 14 12:38:56 2002
@@ -6,8 +6,6 @@
EXTRA_TARGETS := $(BOARD)/bootlogo.rh $(BOARD)/crt0_$(MODEL).o
-include $(TOPDIR)/Rules.make
-
$(obj)/$(BOARD)/bootlogo.rh: $(src)/../68EZ328/bootlogo.h
perl $(src)/../68328/bootlogo.pl < $(src)/../68EZ328/bootlogo.h \
> $(obj)/$(BOARD)/bootlogo.rh
diff -urN linux-2.5.51-bk1/arch/m68knommu/platform/Makefile linux/arch/m68knommu/platform/Makefile
--- linux-2.5.51-bk1/arch/m68knommu/platform/Makefile Sat Dec 14 12:31:58 2002
+++ linux/arch/m68knommu/platform/Makefile Sat Dec 14 12:38:56 2002
@@ -1,6 +1,3 @@
#
# Makefile for the arch/m68knommu/platform.
#
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/mips/arc/Makefile linux/arch/mips/arc/Makefile
--- linux-2.5.51-bk1/arch/mips/arc/Makefile Sat Dec 14 12:31:33 2002
+++ linux/arch/mips/arc/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
time.o file.o identify.o
obj-$(CONFIG_ARC_CONSOLE) += arc_con.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/au1000/common/Makefile linux/arch/mips/au1000/common/Makefile
--- linux-2.5.51-bk1/arch/mips/au1000/common/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/au1000/common/Makefile Sat Dec 14 12:38:56 2002
@@ -16,7 +16,5 @@
EXTRA_AFLAGS := $(CFLAGS)
-include $(TOPDIR)/Rules.make
-
ramdisk.o:
mkramobj ramdisk ramdisk.o
diff -urN linux-2.5.51-bk1/arch/mips/au1000/pb1000/Makefile linux/arch/mips/au1000/pb1000/Makefile
--- linux-2.5.51-bk1/arch/mips/au1000/pb1000/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/au1000/pb1000/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
#
obj-y := init.o setup.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/baget/Makefile linux/arch/mips/baget/Makefile
--- linux-2.5.51-bk1/arch/mips/baget/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/baget/Makefile Sat Dec 14 12:38:56 2002
@@ -9,8 +9,6 @@
obj-$(CONFIG_SERIAL) += vacserial.o
obj-$(CONFIG_VAC_RTC) += vacrtc.o
-include $(TOPDIR)/Rules.make
-
bagetIRQ.o : bagetIRQ.S
$(CC) $(CFLAGS) -c -o $@ $<
diff -urN linux-2.5.51-bk1/arch/mips/baget/prom/Makefile linux/arch/mips/baget/prom/Makefile
--- linux-2.5.51-bk1/arch/mips/baget/prom/Makefile Sat Dec 14 12:31:33 2002
+++ linux/arch/mips/baget/prom/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
L_TARGET := lib.a
obj-y := init.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/boot/Makefile linux/arch/mips/boot/Makefile
--- linux-2.5.51-bk1/arch/mips/boot/Makefile Sun Sep 15 22:18:48 2002
+++ linux/arch/mips/boot/Makefile Sat Dec 14 12:38:56 2002
@@ -43,5 +43,3 @@
rm -f vmlinux.ecoff
rm -f addinitrd
rm -f elf2ecoff
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/ddb5074/Makefile linux/arch/mips/ddb5074/Makefile
--- linux-2.5.51-bk1/arch/mips/ddb5074/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/ddb5074/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
EXTRA_AFLAGS := $(CFLAGS)
obj-y := setup.o irq.o time.o prom.o pci.o int-handler.o nile4.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/ddb5476/Makefile linux/arch/mips/ddb5476/Makefile
--- linux-2.5.51-bk1/arch/mips/ddb5476/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/ddb5476/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
obj-y += setup.o irq.o time.o prom.o pci.o \
int-handler.o nile4.o
obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/ddb5xxx/common/Makefile linux/arch/mips/ddb5xxx/common/Makefile
--- linux-2.5.51-bk1/arch/mips/ddb5xxx/common/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/ddb5xxx/common/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y += irq.o irq_cpu.o nile4.o prom.o pci.o pci_auto.o rtc_ds1386.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/ddb5xxx/ddb5477/Makefile linux/arch/mips/ddb5xxx/ddb5477/Makefile
--- linux-2.5.51-bk1/arch/mips/ddb5xxx/ddb5477/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/ddb5xxx/ddb5477/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
obj-$(CONFIG_LL_DEBUG) += debug.o
obj-$(CONFIG_REMOTE_DEBUG) += kgdb_io.o
obj-$(CONFIG_BLK_DEV_INITRD) += ramdisk.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/dec/Makefile linux/arch/mips/dec/Makefile
--- linux-2.5.51-bk1/arch/mips/dec/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/dec/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-y := int-handler.o setup.o irq.o time.o reset.o rtc-dec.o wbflush.o
obj-$(CONFIG_PROM_CONSOLE) += promcon.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/dec/boot/Makefile linux/arch/mips/dec/boot/Makefile
--- linux-2.5.51-bk1/arch/mips/dec/boot/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/dec/boot/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
clean:
rm -f nbImage
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/dec/prom/Makefile linux/arch/mips/dec/prom/Makefile
--- linux-2.5.51-bk1/arch/mips/dec/prom/Makefile Sat Dec 14 12:31:33 2002
+++ linux/arch/mips/dec/prom/Makefile Sat Dec 14 12:38:56 2002
@@ -9,7 +9,5 @@
EXTRA_AFLAGS := $(CFLAGS)
-include $(TOPDIR)/Rules.make
-
dep:
$(CPP) $(CPPFLAGS) -M *.c > .depend
diff -urN linux-2.5.51-bk1/arch/mips/gt64120/common/Makefile linux/arch/mips/gt64120/common/Makefile
--- linux-2.5.51-bk1/arch/mips/gt64120/common/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/gt64120/common/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := gt_irq.o pci.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/gt64120/momenco_ocelot/Makefile linux/arch/mips/gt64120/momenco_ocelot/Makefile
--- linux-2.5.51-bk1/arch/mips/gt64120/momenco_ocelot/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/gt64120/momenco_ocelot/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-y += int-handler.o irq.o pci.o prom.o reset.o setup.o
obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/ite-boards/generic/Makefile linux/arch/mips/ite-boards/generic/Makefile
--- linux-2.5.51-bk1/arch/mips/ite-boards/generic/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/ite-boards/generic/Makefile Sat Dec 14 12:38:56 2002
@@ -21,5 +21,3 @@
endif
EXTRA_AFLAGS := $(CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/ite-boards/ivr/Makefile linux/arch/mips/ite-boards/ivr/Makefile
--- linux-2.5.51-bk1/arch/mips/ite-boards/ivr/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/ite-boards/ivr/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
obj-$(CONFIG_PCI) += pci_fixup.o
obj-$(CONFIG_BLK_DEV_INITRD) += le_ramdisk.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/ite-boards/qed-4n-s01b/Makefile linux/arch/mips/ite-boards/qed-4n-s01b/Makefile
--- linux-2.5.51-bk1/arch/mips/ite-boards/qed-4n-s01b/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/ite-boards/qed-4n-s01b/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
obj-y := init.o
obj-$(CONFIG_PCI) += pci_fixup.o
obj-$(CONFIG_BLK_DEV_INITRD) += le_ramdisk.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/jazz/Makefile linux/arch/mips/jazz/Makefile
--- linux-2.5.51-bk1/arch/mips/jazz/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/jazz/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
floppy-jazz.o kbd-jazz.o
EXTRA_AFLAGS := $(CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/kernel/Makefile linux/arch/mips/kernel/Makefile
--- linux-2.5.51-bk1/arch/mips/kernel/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -46,5 +46,3 @@
obj-$(CONFIG_NEW_PCI) += pci.o
obj-$(CONFIG_PCI_AUTO) += pci_auto.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/lib/Makefile linux/arch/mips/lib/Makefile
--- linux-2.5.51-bk1/arch/mips/lib/Makefile Sun Sep 15 22:18:19 2002
+++ linux/arch/mips/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -20,5 +20,3 @@
obj-$(CONFIG_BLK_DEV_FD) += floppy-no.o floppy-std.o
obj-$(CONFIG_IDE) += ide-std.o ide-no.o
obj-$(CONFIG_PC_KEYB) += kbd-std.o kbd-no.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/math-emu/Makefile linux/arch/mips/math-emu/Makefile
--- linux-2.5.51-bk1/arch/mips/math-emu/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/math-emu/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
dp_sqrt.o sp_sqrt.o kernel_linkage.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/mips-boards/atlas/Makefile linux/arch/mips/mips-boards/atlas/Makefile
--- linux-2.5.51-bk1/arch/mips/mips-boards/atlas/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/mips-boards/atlas/Makefile Sat Dec 14 12:38:56 2002
@@ -24,5 +24,3 @@
#
obj-y := atlas_int.o atlas_rtc.o atlas_setup.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/mips-boards/generic/Makefile linux/arch/mips/mips-boards/generic/Makefile
--- linux-2.5.51-bk1/arch/mips/mips-boards/generic/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/mips-boards/generic/Makefile Sat Dec 14 12:38:56 2002
@@ -27,5 +27,3 @@
obj-y := mipsIRQ.o pci.o reset.o display.o init.o \
memory.o printf.o cmdline.o time.o
obj-$(CONFIG_REMOTE_DEBUG) += gdb_hook.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/mips-boards/malta/Makefile linux/arch/mips/mips-boards/malta/Makefile
--- linux-2.5.51-bk1/arch/mips/mips-boards/malta/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/mips-boards/malta/Makefile Sat Dec 14 12:38:56 2002
@@ -24,5 +24,3 @@
#
obj-y := malta_int.o malta_rtc.o malta_setup.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/mm/Makefile linux/arch/mips/mm/Makefile
--- linux-2.5.51-bk1/arch/mips/mm/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -17,5 +17,3 @@
obj-$(CONFIG_CPU_MIPS64) += mips32.o
obj-$(CONFIG_SGI_IP22) += umap.o
obj-$(CONFIG_BAGET_MIPS) += umap.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/philips/nino/Makefile linux/arch/mips/philips/nino/Makefile
--- linux-2.5.51-bk1/arch/mips/philips/nino/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/philips/nino/Makefile Sat Dec 14 12:38:56 2002
@@ -8,8 +8,6 @@
obj-$(CONFIG_BLK_DEV_INITRD) += ramdisk.o
-include $(TOPDIR)/Rules.make
-
ramdisk.o:
$(MAKE) -C ramdisk
mv ramdisk/ramdisk.o ramdisk.o
diff -urN linux-2.5.51-bk1/arch/mips/philips/nino/ramdisk/Makefile linux/arch/mips/philips/nino/ramdisk/Makefile
--- linux-2.5.51-bk1/arch/mips/philips/nino/ramdisk/Makefile Sun Sep 15 22:18:27 2002
+++ linux/arch/mips/philips/nino/ramdisk/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
ramdisk.o: ramdisk.gz ld.script
$(LD) $(LDFLAGS) -T ld.script -b binary -o $@ ramdisk.gz
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/sgi/kernel/Makefile linux/arch/mips/sgi/kernel/Makefile
--- linux-2.5.51-bk1/arch/mips/sgi/kernel/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/sgi/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
indyIRQ.o reset.o setup.o time.o
EXTRA_AFLAGS := $(CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/sni/Makefile linux/arch/mips/sni/Makefile
--- linux-2.5.51-bk1/arch/mips/sni/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips/sni/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
obj-y := int-handler.o io.o irq.o pci.o pcimt_scache.o reset.o setup.o
EXTRA_AFLAGS := $(CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips/tools/Makefile linux/arch/mips/tools/Makefile
--- linux-2.5.51-bk1/arch/mips/tools/Makefile Sun Sep 15 22:18:22 2002
+++ linux/arch/mips/tools/Makefile Sat Dec 14 12:38:56 2002
@@ -21,5 +21,3 @@
mrproper:
rm -f offset.[hs] $(TARGET).new
rm -f $(TARGET)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/arc/Makefile linux/arch/mips64/arc/Makefile
--- linux-2.5.51-bk1/arch/mips64/arc/Makefile Sat Dec 14 12:31:33 2002
+++ linux/arch/mips64/arc/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
obj-$(CONFIG_ARC_MEMORY) += memory.o
obj-$(CONFIG_ARC_CONSOLE) += arc_con.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/boot/Makefile linux/arch/mips64/boot/Makefile
--- linux-2.5.51-bk1/arch/mips64/boot/Makefile Sun Sep 15 22:18:53 2002
+++ linux/arch/mips64/boot/Makefile Sat Dec 14 12:38:56 2002
@@ -31,5 +31,3 @@
mrproper:
rm -f vmlinux.ecoff addinitrd elf2ecoff
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/kernel/Makefile linux/arch/mips64/kernel/Makefile
--- linux-2.5.51-bk1/arch/mips64/kernel/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips64/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -19,5 +19,3 @@
AFLAGS_r4k_genex.o := -P
AFLAGS_r4k_tlb_glue.o := -P
EXTRA_AFLAGS := $(CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/lib/Makefile linux/arch/mips64/lib/Makefile
--- linux-2.5.51-bk1/arch/mips64/lib/Makefile Sun Sep 15 22:18:25 2002
+++ linux/arch/mips64/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
floppy-no.o ide-std.o ide-no.o kbd-std.o kbd-no.o rtc-std.o \
rtc-no.o memset.o memcpy.o strlen_user.o strncpy_user.o \
strnlen_user.o watch.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/math-emu/Makefile linux/arch/mips64/math-emu/Makefile
--- linux-2.5.51-bk1/arch/mips64/math-emu/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips64/math-emu/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
dp_sqrt.o sp_sqrt.o kernel_linkage.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/mips-boards/atlas/Makefile linux/arch/mips64/mips-boards/atlas/Makefile
--- linux-2.5.51-bk1/arch/mips64/mips-boards/atlas/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips64/mips-boards/atlas/Makefile Sat Dec 14 12:38:56 2002
@@ -24,5 +24,3 @@
#
obj-y := atlas_int.o atlas_rtc.o atlas_setup.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/mips-boards/generic/Makefile linux/arch/mips64/mips-boards/generic/Makefile
--- linux-2.5.51-bk1/arch/mips64/mips-boards/generic/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips64/mips-boards/generic/Makefile Sat Dec 14 12:38:56 2002
@@ -27,5 +27,3 @@
obj-$(CONFIG_REMOTE_DEBUG) += gdb_hook.o
EXTRA_AFLAGS := $(CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/mips-boards/malta/Makefile linux/arch/mips64/mips-boards/malta/Makefile
--- linux-2.5.51-bk1/arch/mips64/mips-boards/malta/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips64/mips-boards/malta/Makefile Sat Dec 14 12:38:56 2002
@@ -24,5 +24,3 @@
#
obj-y := malta_int.o malta_rtc.o malta_setup.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/mm/Makefile linux/arch/mips64/mm/Makefile
--- linux-2.5.51-bk1/arch/mips64/mm/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips64/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -12,5 +12,3 @@
obj-$(CONFIG_CPU_NEVADA) += r4xx0.o
obj-$(CONFIG_CPU_R10000) += andes.o
obj-$(CONFIG_SGI_IP22) += umap.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/sgi-ip22/Makefile linux/arch/mips64/sgi-ip22/Makefile
--- linux-2.5.51-bk1/arch/mips64/sgi-ip22/Makefile Sat Dec 14 12:31:33 2002
+++ linux/arch/mips64/sgi-ip22/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
obj-y += ip22-berr.o ip22-mc.o ip22-sc.o ip22-hpc.o ip22-int.o ip22-rtc.o \
ip22-setup.o system.o ip22-timer.o ip22-irq.o ip22-reset.o time.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/sgi-ip27/Makefile linux/arch/mips64/sgi-ip27/Makefile
--- linux-2.5.51-bk1/arch/mips64/sgi-ip27/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips64/sgi-ip27/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-y := ip27-berr.o ip27-console.o ip27-irq.o ip27-init.o ip27-irq-glue.o \
ip27-klconfig.o ip27-klnuma.o ip27-memory.o ip27-nmi.o ip27-pci.o \
ip27-pci-dma.o ip27-reset.o ip27-setup.o ip27-timer.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/sgi-ip32/Makefile linux/arch/mips64/sgi-ip32/Makefile
--- linux-2.5.51-bk1/arch/mips64/sgi-ip32/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/mips64/sgi-ip32/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
obj-$(CONFIG_PCI) += ip32-pci.o ip32-pci-dma.o
EXTRA_AFLAGS := $(CFLAGS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/mips64/tools/Makefile linux/arch/mips64/tools/Makefile
--- linux-2.5.51-bk1/arch/mips64/tools/Makefile Sun Sep 15 22:18:20 2002
+++ linux/arch/mips64/tools/Makefile Sat Dec 14 12:38:56 2002
@@ -21,5 +21,3 @@
mrproper:
rm -f offset.[hs] $(TARGET).new
rm -f $(TARGET)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc/4xx_io/Makefile linux/arch/ppc/4xx_io/Makefile
--- linux-2.5.51-bk1/arch/ppc/4xx_io/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ppc/4xx_io/Makefile Sat Dec 14 12:38:56 2002
@@ -4,5 +4,3 @@
obj-$(CONFIG_SERIAL_SICC) += serial_sicc.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc/8260_io/Makefile linux/arch/ppc/8260_io/Makefile
--- linux-2.5.51-bk1/arch/ppc/8260_io/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ppc/8260_io/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-$(CONFIG_FEC_ENET) += fcc_enet.o
obj-$(CONFIG_SCC_ENET) += enet.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc/8xx_io/Makefile linux/arch/ppc/8xx_io/Makefile
--- linux-2.5.51-bk1/arch/ppc/8xx_io/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ppc/8xx_io/Makefile Sat Dec 14 12:38:56 2002
@@ -10,5 +10,3 @@
obj-$(CONFIG_SCC_ENET) += enet.o
obj-$(CONFIG_UCODE_PATCH) += micropatch.o
obj-$(CONFIG_HTDMSOUND) += cs4218_tdm.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc/amiga/Makefile linux/arch/ppc/amiga/Makefile
--- linux-2.5.51-bk1/arch/ppc/amiga/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ppc/amiga/Makefile Sat Dec 14 12:38:56 2002
@@ -8,5 +8,3 @@
chipram.o amiga_ksyms.o
obj-$(CONFIG_AMIGA_PCMCIA) += pcmcia.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc/boot/utils/Makefile linux/arch/ppc/boot/utils/Makefile
--- linux-2.5.51-bk1/arch/ppc/boot/utils/Makefile Sun Sep 15 22:18:25 2002
+++ linux/arch/ppc/boot/utils/Makefile Sat Dec 14 12:38:56 2002
@@ -18,5 +18,3 @@
clean:
rm -f $(UTILS)
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc/iSeries/Makefile linux/arch/ppc/iSeries/Makefile
--- linux-2.5.51-bk1/arch/ppc/iSeries/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ppc/iSeries/Makefile Sat Dec 14 12:38:56 2002
@@ -7,8 +7,6 @@
obj-$(CONFIG_PCI) += XmPciLpEvent.o iSeries_FlightRecorder.o iSeries_IoMmTable.o iSeries_VpdInfo.o iSeries_fixup.o iSeries_irq.o iSeries_pci.o iSeries_pci_proc.o iSeries_reset_device.o
-include $(TOPDIR)/Rules.make
-
LparData.c:: ReleaseData.h
ReleaseData.h: $(TOPDIR)/Makefile
diff -urN linux-2.5.51-bk1/arch/ppc/kernel/Makefile linux/arch/ppc/kernel/Makefile
--- linux-2.5.51-bk1/arch/ppc/kernel/Makefile Sat Dec 14 12:32:04 2002
+++ linux/arch/ppc/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -40,7 +40,5 @@
endif
obj-$(CONFIG_PPC_ISERIES) += iSeries_misc.o
-include $(TOPDIR)/Rules.make
-
find_name : find_name.c
$(HOSTCC) $(HOSTCFLAGS) -o find_name find_name.c
diff -urN linux-2.5.51-bk1/arch/ppc/lib/Makefile linux/arch/ppc/lib/Makefile
--- linux-2.5.51-bk1/arch/ppc/lib/Makefile Sat Dec 14 12:31:44 2002
+++ linux/arch/ppc/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-y := checksum.o string.o strcase.o dec_and_lock.o div64.o
obj-$(CONFIG_SMP) += locks.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc/math-emu/Makefile linux/arch/ppc/math-emu/Makefile
--- linux-2.5.51-bk1/arch/ppc/math-emu/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ppc/math-emu/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
mcrfs.o mffs.o mtfsb0.o mtfsb1.o \
mtfsf.o mtfsfi.o stfiwx.o stfs.o \
udivmodti4.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc/mm/Makefile linux/arch/ppc/mm/Makefile
--- linux-2.5.51-bk1/arch/ppc/mm/Makefile Sat Dec 14 12:32:00 2002
+++ linux/arch/ppc/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -13,5 +13,3 @@
obj-$(CONFIG_PPC_ISERIES) += iSeries_hashtable.o iSeries_mmu.o tlb.o
obj-$(CONFIG_40x) += 4xx_mmu.o
obj-$(CONFIG_NOT_COHERENT_CACHE) += cachemap.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc/platforms/4xx/Makefile linux/arch/ppc/platforms/4xx/Makefile
--- linux-2.5.51-bk1/arch/ppc/platforms/4xx/Makefile Sat Dec 14 12:31:40 2002
+++ linux/arch/ppc/platforms/4xx/Makefile Sat Dec 14 12:38:56 2002
@@ -15,5 +15,3 @@
obj-$(CONFIG_REDWOOD_4) += ibmstb3.o
obj-$(CONFIG_REDWOOD_5) += ibmstb4.o
obj-$(CONFIG_NP405H) += ibmnp405h.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc/platforms/Makefile linux/arch/ppc/platforms/Makefile
--- linux-2.5.51-bk1/arch/ppc/platforms/Makefile Sat Dec 14 12:32:00 2002
+++ linux/arch/ppc/platforms/Makefile Sat Dec 14 12:38:56 2002
@@ -53,5 +53,3 @@
obj-$(CONFIG_ALL_PPC) += pmac_smp.o chrp_smp.o
obj-$(CONFIG_PPC_ISERIES) += iSeries_smp.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc/syslib/Makefile linux/arch/ppc/syslib/Makefile
--- linux-2.5.51-bk1/arch/ppc/syslib/Makefile Sat Dec 14 12:32:00 2002
+++ linux/arch/ppc/syslib/Makefile Sat Dec 14 12:38:56 2002
@@ -62,7 +62,5 @@
obj-$(CONFIG_8260) += m8260_setup.o ppc8260_pic.o
obj-$(CONFIG_BOOTX_TEXT) += btext.o
-include $(TOPDIR)/Rules.make
-
find_name : find_name.c
$(HOSTCC) $(HOSTCFLAGS) -o find_name find_name.c
diff -urN linux-2.5.51-bk1/arch/ppc/xmon/Makefile linux/arch/ppc/xmon/Makefile
--- linux-2.5.51-bk1/arch/ppc/xmon/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ppc/xmon/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-y := start.o
endif
obj-y += xmon.o ppc-dis.o ppc-opc.o subr_prf.o setjmp.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc64/kernel/Makefile linux/arch/ppc64/kernel/Makefile
--- linux-2.5.51-bk1/arch/ppc64/kernel/Makefile Sat Dec 14 12:32:10 2002
+++ linux/arch/ppc64/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -38,6 +38,3 @@
obj-$(CONFIG_PROFILING) += profile.o
obj-y += prom.o lmb.o rtas.o rtas-proc.o chrp_setup.o i8259.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/ppc64/lib/Makefile linux/arch/ppc64/lib/Makefile
--- linux-2.5.51-bk1/arch/ppc64/lib/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ppc64/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-y := checksum.o dec_and_lock.o string.o strcase.o copypage.o \
memcpy.o copyuser.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc64/mm/Makefile linux/arch/ppc64/mm/Makefile
--- linux-2.5.51-bk1/arch/ppc64/mm/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ppc64/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-y := fault.o init.o extable.o imalloc.o
obj-$(CONFIG_DISCONTIGMEM) += numa.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/ppc64/xmon/Makefile linux/arch/ppc64/xmon/Makefile
--- linux-2.5.51-bk1/arch/ppc64/xmon/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/ppc64/xmon/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
EXTRA_CFLAGS = -mno-minimal-toc
obj-y := start.o xmon.o ppc-dis.o ppc-opc.o subr_prf.o setjmp.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/s390/boot/Makefile linux/arch/s390/boot/Makefile
--- linux-2.5.51-bk1/arch/s390/boot/Makefile Sat Dec 14 12:32:04 2002
+++ linux/arch/s390/boot/Makefile Sat Dec 14 12:38:56 2002
@@ -4,8 +4,6 @@
EXTRA_AFLAGS := -traditional
-include $(TOPDIR)/Rules.make
-
quiet_cmd_listing = OBJDUMP $(echo_target)
cmd_listing = $(OBJDUMP) --disassemble --disassemble-all \
--disassemble-zeroes --reloc vmlinux > $@
diff -urN linux-2.5.51-bk1/arch/s390/kernel/Makefile linux/arch/s390/kernel/Makefile
--- linux-2.5.51-bk1/arch/s390/kernel/Makefile Sat Dec 14 12:32:04 2002
+++ linux/arch/s390/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -17,5 +17,3 @@
# Kernel debugging
#
obj-$(CONFIG_REMOTE_DEBUG) += gdb-stub.o #gdb-low.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/s390/lib/Makefile linux/arch/s390/lib/Makefile
--- linux-2.5.51-bk1/arch/s390/lib/Makefile Sat Dec 14 12:31:37 2002
+++ linux/arch/s390/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -7,6 +7,3 @@
EXTRA_AFLAGS := -traditional
obj-y = delay.o memset.o strcmp.o strncpy.o uaccess.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/s390/math-emu/Makefile linux/arch/s390/math-emu/Makefile
--- linux-2.5.51-bk1/arch/s390/math-emu/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/s390/math-emu/Makefile Sat Dec 14 12:38:56 2002
@@ -6,7 +6,3 @@
EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w
EXTRA_AFLAGS := -traditional
-
-include $(TOPDIR)/Rules.make
-
-
diff -urN linux-2.5.51-bk1/arch/s390/mm/Makefile linux/arch/s390/mm/Makefile
--- linux-2.5.51-bk1/arch/s390/mm/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/s390/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := init.o fault.o ioremap.o extable.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/s390x/boot/Makefile linux/arch/s390x/boot/Makefile
--- linux-2.5.51-bk1/arch/s390x/boot/Makefile Sat Dec 14 12:32:04 2002
+++ linux/arch/s390x/boot/Makefile Sat Dec 14 12:38:56 2002
@@ -4,8 +4,6 @@
EXTRA_AFLAGS := -traditional
-include $(TOPDIR)/Rules.make
-
quiet_cmd_listing = OBJDUMP $(echo_target)
cmd_listing = $(OBJDUMP) --disassemble --disassemble-all \
--disassemble-zeroes --reloc vmlinux > $@
diff -urN linux-2.5.51-bk1/arch/s390x/kernel/Makefile linux/arch/s390x/kernel/Makefile
--- linux-2.5.51-bk1/arch/s390x/kernel/Makefile Sat Dec 14 12:32:04 2002
+++ linux/arch/s390x/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -24,8 +24,6 @@
exec32.o exec_domain32.o
obj-$(CONFIG_BINFMT_ELF32) += binfmt_elf32.o
-include $(TOPDIR)/Rules.make
-
#
# This is just to get the dependencies...
#
diff -urN linux-2.5.51-bk1/arch/s390x/lib/Makefile linux/arch/s390x/lib/Makefile
--- linux-2.5.51-bk1/arch/s390x/lib/Makefile Sat Dec 14 12:31:37 2002
+++ linux/arch/s390x/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -7,6 +7,3 @@
EXTRA_AFLAGS := -traditional
obj-y = delay.o memset.o strcmp.o strncpy.o uaccess.o
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/s390x/mm/Makefile linux/arch/s390x/mm/Makefile
--- linux-2.5.51-bk1/arch/s390x/mm/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/s390x/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := init.o fault.o ioremap.o extable.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/sh/kernel/Makefile linux/arch/sh/kernel/Makefile
--- linux-2.5.51-bk1/arch/sh/kernel/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/sh/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -72,5 +72,3 @@
ifeq ($(CONFIG_SH_GENERIC),y)
obj-y += $(machine-specific-objs)
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/sh/lib/Makefile linux/arch/sh/lib/Makefile
--- linux-2.5.51-bk1/arch/sh/lib/Makefile Sat Dec 14 12:31:44 2002
+++ linux/arch/sh/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
L_TARGET = lib.a
obj-y = delay.o memcpy.o memset.o memmove.o memchr.o \
checksum.o strcasecmp.o strlen.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/sh/mm/Makefile linux/arch/sh/mm/Makefile
--- linux-2.5.51-bk1/arch/sh/mm/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/sh/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
obj-$(CONFIG_CPU_SH3) += cache-sh3.o
obj-$(CONFIG_CPU_SH4) += cache-sh4.o __clear_user_page-sh4.o __copy_user_page-sh4.o ioremap.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/sh/stboards/Makefile linux/arch/sh/stboards/Makefile
--- linux-2.5.51-bk1/arch/sh/stboards/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/sh/stboards/Makefile Sat Dec 14 12:38:56 2002
@@ -3,5 +3,3 @@
#
obj-y := irq.o setup.o mach.o led.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/sparc/boot/Makefile linux/arch/sparc/boot/Makefile
--- linux-2.5.51-bk1/arch/sparc/boot/Makefile Sat Dec 14 12:32:00 2002
+++ linux/arch/sparc/boot/Makefile Sat Dec 14 12:38:56 2002
@@ -39,5 +39,3 @@
btfix.o: btfix.s
$(CC) -c -o btfix.o btfix.s
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/sparc/kernel/Makefile linux/arch/sparc/kernel/Makefile
--- linux-2.5.51-bk1/arch/sparc/kernel/Makefile Sat Dec 14 12:32:02 2002
+++ linux/arch/sparc/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -27,5 +27,3 @@
ifdef CONFIG_SUNOS_EMUL
obj-y += sys_sunos.o sunos_ioctl.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/sparc/lib/Makefile linux/arch/sparc/lib/Makefile
--- linux-2.5.51-bk1/arch/sparc/lib/Makefile Sun Sep 15 22:18:58 2002
+++ linux/arch/sparc/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -11,5 +11,3 @@
strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \
copy_user.o locks.o atomic.o bitops.o debuglocks.o lshrdi3.o \
ashldi3.o rwsem.o muldi3.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/sparc/math-emu/Makefile linux/arch/sparc/math-emu/Makefile
--- linux-2.5.51-bk1/arch/sparc/math-emu/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/sparc/math-emu/Makefile Sat Dec 14 12:38:56 2002
@@ -6,5 +6,3 @@
EXTRA_AFLAGS := -ansi
EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/sparc/mm/Makefile linux/arch/sparc/mm/Makefile
--- linux-2.5.51-bk1/arch/sparc/mm/Makefile Sat Dec 14 12:31:37 2002
+++ linux/arch/sparc/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -21,5 +21,3 @@
else
obj-y += sun4c.o
endif
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/sparc/prom/Makefile linux/arch/sparc/prom/Makefile
--- linux-2.5.51-bk1/arch/sparc/prom/Makefile Sat Dec 14 12:31:33 2002
+++ linux/arch/sparc/prom/Makefile Sat Dec 14 12:38:56 2002
@@ -9,5 +9,3 @@
palloc.o ranges.o segment.o console.o printf.o tree.o
obj-$(CONFIG_SUN4) += sun4prom.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/sparc64/kernel/Makefile linux/arch/sparc64/kernel/Makefile
--- linux-2.5.51-bk1/arch/sparc64/kernel/Makefile Sat Dec 14 12:32:10 2002
+++ linux/arch/sparc64/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -36,7 +36,5 @@
CMODEL_CFLAG := -m64 -mcmodel=medlow
endif
-include $(TOPDIR)/Rules.make
-
head.o: head.S ttable.S itlb_base.S dtlb_base.S dtlb_backend.S dtlb_prot.S \
etrap.S rtrap.S winfixup.S entry.S
diff -urN linux-2.5.51-bk1/arch/um/drivers/Makefile linux/arch/um/drivers/Makefile
--- linux-2.5.51-bk1/arch/um/drivers/Makefile Sat Dec 14 12:32:02 2002
+++ linux/arch/um/drivers/Makefile Sat Dec 14 12:38:56 2002
@@ -60,8 +60,6 @@
null.o pty.o tty.o xterm.o
USER_OBJS := $(foreach file,$(USER_OBJS),arch/um/drivers/$(file))
-include $(TOPDIR)/Rules.make
-
$(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
diff -urN linux-2.5.51-bk1/arch/um/kernel/Makefile linux/arch/um/kernel/Makefile
--- linux-2.5.51-bk1/arch/um/kernel/Makefile Sat Dec 14 12:32:02 2002
+++ linux/arch/um/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -10,7 +10,7 @@
obj-$(CONFIG_BLK_DEV_INITRD) += initrd_kern.o initrd_user.o
-# user_syms.o not included here because Rules.make has its own ideas about
+# user_syms.o not included here because kbuild has its own ideas about
# building anything in export-objs
USER_OBJS := $(filter %_user.o,$(obj-y)) config.o helper.o process.o \
@@ -39,8 +39,6 @@
CFLAGS_frame.o := $(patsubst -fomit-frame-pointer,,$(USER_CFLAGS))
-include $(TOPDIR)/Rules.make
-
$(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
diff -urN linux-2.5.51-bk1/arch/um/os-Linux/Makefile linux/arch/um/os-Linux/Makefile
--- linux-2.5.51-bk1/arch/um/os-Linux/Makefile Sat Dec 14 12:32:02 2002
+++ linux/arch/um/os-Linux/Makefile Sat Dec 14 12:38:56 2002
@@ -7,8 +7,6 @@
USER_OBJS := $(foreach file,$(obj-y),arch/um/os-Linux/$(file))
-include $(TOPDIR)/Rules.make
-
$(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
diff -urN linux-2.5.51-bk1/arch/um/os-Linux/drivers/Makefile linux/arch/um/os-Linux/drivers/Makefile
--- linux-2.5.51-bk1/arch/um/os-Linux/drivers/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/um/os-Linux/drivers/Makefile Sat Dec 14 12:38:56 2002
@@ -14,7 +14,5 @@
USER_OBJS = $(filter %_user.o,$(obj-y) $(USER_SINGLE_OBJS))
-include $(TOPDIR)/Rules.make
-
$(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
diff -urN linux-2.5.51-bk1/arch/um/ptproxy/Makefile linux/arch/um/ptproxy/Makefile
--- linux-2.5.51-bk1/arch/um/ptproxy/Makefile Sat Dec 14 12:31:40 2002
+++ linux/arch/um/ptproxy/Makefile Sat Dec 14 12:38:56 2002
@@ -2,8 +2,6 @@
USER_OBJS := $(foreach file,$(obj-y),arch/um/ptproxy/$(file))
-include $(TOPDIR)/Rules.make
-
$(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
diff -urN linux-2.5.51-bk1/arch/um/sys-i386/Makefile linux/arch/um/sys-i386/Makefile
--- linux-2.5.51-bk1/arch/um/sys-i386/Makefile Sat Dec 14 12:32:02 2002
+++ linux/arch/um/sys-i386/Makefile Sat Dec 14 12:38:56 2002
@@ -10,8 +10,6 @@
SYMLINKS = semaphore.c checksum.S extable.c highmem.c
-include $(TOPDIR)/Rules.make
-
$(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
diff -urN linux-2.5.51-bk1/arch/um/sys-i386/util/Makefile linux/arch/um/sys-i386/util/Makefile
--- linux-2.5.51-bk1/arch/um/sys-i386/util/Makefile Sat Dec 14 12:31:42 2002
+++ linux/arch/um/sys-i386/util/Makefile Sat Dec 14 12:38:56 2002
@@ -4,8 +4,6 @@
mk_sc-objs := mk_sc.o
-include $(TOPDIR)/Rules.make
-
$(obj)/mk_thread : $(obj)/mk_thread_kern.o $(obj)/mk_thread_user.o
$(CC) $(CFLAGS) -o $@ $^
diff -urN linux-2.5.51-bk1/arch/um/sys-ia64/Makefile linux/arch/um/sys-ia64/Makefile
--- linux-2.5.51-bk1/arch/um/sys-ia64/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/um/sys-ia64/Makefile Sat Dec 14 12:38:56 2002
@@ -22,5 +22,3 @@
@$(MAKEBOOT) dep
modules:
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/um/sys-ppc/Makefile linux/arch/um/sys-ppc/Makefile
--- linux-2.5.51-bk1/arch/um/sys-ppc/Makefile Sat Dec 14 12:31:35 2002
+++ linux/arch/um/sys-ppc/Makefile Sat Dec 14 12:38:56 2002
@@ -76,5 +76,3 @@
dep:
modules:
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/um/util/Makefile linux/arch/um/util/Makefile
--- linux-2.5.51-bk1/arch/um/util/Makefile Sat Dec 14 12:31:42 2002
+++ linux/arch/um/util/Makefile Sat Dec 14 12:38:56 2002
@@ -1,7 +1,5 @@
EXTRA_TARGETS := mk_task mk_task_kern.o
-include $(TOPDIR)/Rules.make
-
$(obj)/mk_task: $(obj)/mk_task_user.o $(obj)/mk_task_kern.o
$(CC) -o $@ $^
diff -urN linux-2.5.51-bk1/arch/v850/Makefile linux/arch/v850/Makefile
--- linux-2.5.51-bk1/arch/v850/Makefile Sat Dec 14 12:32:06 2002
+++ linux/arch/v850/Makefile Sat Dec 14 12:38:56 2002
@@ -31,9 +31,6 @@
libs-y += $(arch_dir)/lib/
-include $(TOPDIR)/Rules.make
-
-
# Deal with the initial contents of the root device
ifdef ROOT_FS_IMAGE
core-y += root_fs_image.o
diff -urN linux-2.5.51-bk1/arch/v850/kernel/Makefile linux/arch/v850/kernel/Makefile
--- linux-2.5.51-bk1/arch/v850/kernel/Makefile Sat Dec 14 12:32:06 2002
+++ linux/arch/v850/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -34,6 +34,3 @@
# feature-specific code
obj-$(CONFIG_V850E_MA1_HIGHRES_TIMER) += highres_timer.o
obj-$(CONFIG_PROC_FS) += procfs.o
-
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/v850/lib/Makefile linux/arch/v850/lib/Makefile
--- linux-2.5.51-bk1/arch/v850/lib/Makefile Sat Dec 14 12:31:59 2002
+++ linux/arch/v850/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
L_TARGET = lib.a
obj-y = ashrdi3.o ashldi3.o lshrdi3.o muldi3.o negdi2.o \
checksum.o memcpy.o memset.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/x86_64/boot/Makefile linux/arch/x86_64/boot/Makefile
--- linux-2.5.51-bk1/arch/x86_64/boot/Makefile Sat Dec 14 12:31:48 2002
+++ linux/arch/x86_64/boot/Makefile Sat Dec 14 12:38:56 2002
@@ -36,8 +36,6 @@
boot: bzImage
-include $(TOPDIR)/Rules.make
-
# ---------------------------------------------------------------------------
$(obj)/zImage: IMAGE_OFFSET := 0x1000
diff -urN linux-2.5.51-bk1/arch/x86_64/boot/compressed/Makefile linux/arch/x86_64/boot/compressed/Makefile
--- linux-2.5.51-bk1/arch/x86_64/boot/compressed/Makefile Sat Dec 14 12:31:42 2002
+++ linux/arch/x86_64/boot/compressed/Makefile Sat Dec 14 12:38:56 2002
@@ -14,8 +14,6 @@
CFLAGS := -m32 -D__KERNEL__ -I$(TOPDIR)/include -O2
LDFLAGS := -m elf_i386
-include $(TOPDIR)/Rules.make
-
LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup_32 -m elf_i386
$(obj)/vmlinux: $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
diff -urN linux-2.5.51-bk1/arch/x86_64/ia32/Makefile linux/arch/x86_64/ia32/Makefile
--- linux-2.5.51-bk1/arch/x86_64/ia32/Makefile Sat Dec 14 12:31:42 2002
+++ linux/arch/x86_64/ia32/Makefile Sat Dec 14 12:38:56 2002
@@ -7,5 +7,3 @@
obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_ioctl.o \
ia32_signal.o \
ia32_binfmt.o fpu32.o socket32.o ptrace32.o ipc32.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/x86_64/kernel/Makefile linux/arch/x86_64/kernel/Makefile
--- linux-2.5.51-bk1/arch/x86_64/kernel/Makefile Sat Dec 14 12:31:48 2002
+++ linux/arch/x86_64/kernel/Makefile Sat Dec 14 12:38:56 2002
@@ -24,6 +24,3 @@
obj-$(CONFIG_DUMMY_IOMMU) += pci-nommu.o
EXTRA_AFLAGS := -traditional
-
-include $(TOPDIR)/Rules.make
-
diff -urN linux-2.5.51-bk1/arch/x86_64/lib/Makefile linux/arch/x86_64/lib/Makefile
--- linux-2.5.51-bk1/arch/x86_64/lib/Makefile Sat Dec 14 12:31:42 2002
+++ linux/arch/x86_64/lib/Makefile Sat Dec 14 12:38:56 2002
@@ -17,5 +17,3 @@
obj-$(CONFIG_IO_DEBUG) += iodebug.o
obj-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/x86_64/mm/Makefile linux/arch/x86_64/mm/Makefile
--- linux-2.5.51-bk1/arch/x86_64/mm/Makefile Sat Dec 14 12:31:44 2002
+++ linux/arch/x86_64/mm/Makefile Sat Dec 14 12:38:56 2002
@@ -5,5 +5,3 @@
export-objs := pageattr.o
obj-y := init.o fault.o ioremap.o extable.o modutil.o pageattr.o
-
-include $(TOPDIR)/Rules.make
diff -urN linux-2.5.51-bk1/arch/x86_64/pci/Makefile linux/arch/x86_64/pci/Makefile
--- linux-2.5.51-bk1/arch/x86_64/pci/Makefile Sat Dec 14 12:31:42 2002
+++ linux/arch/x86_64/pci/Makefile Sat Dec 14 12:38:56 2002
@@ -12,5 +12,3 @@
obj-y += irq.o common.o
-
-include $(TOPDIR)/Rules.make
^ permalink raw reply
* Re: listen, permissions
From: Tomi Manninen @ 2002-12-14 17:48 UTC (permalink / raw)
To: linux-hams
In-Reply-To: <Pine.LNX.4.44.0212141058400.15381-100000@jeeves.mvw.net>
On Sat, 14 Dec 2002 mvw@mvw.net wrote:
> > Ass listen 'sniffs' the network devices, it need to run as root. I know - this
> > is not really precise, so someone correct me.
>
> OK, makes sense (it is a promiscuous mode interface!). But what did I do
> on my old 2.0 kernel system (my 486, which has been up forever!) to allow
> it there?
Earlier, listen was by default installed with the SUID bit set and so any
user could run it with root privileges. As this is considered somewhat
dangerous (a bug in listen could allow a local root compromise), ax25-apps
was changed not to do this. So now it is up to each sysop to enable it if
needed. You can do this as root:
chown root /usr/bin/listen # if not already...
chmod u+s /usr/bin/listen
--
Tomi Manninen Internet: oh2bns@sral.fi
OH2BNS AX.25: oh2bns@oh2rbi.fin.eu
KP20ME04 Amprnet: oh2bns@oh2rbi.ampr.org
^ permalink raw reply
* i has a problem with the kernel 2.4.19 and 2.4.20 and iptable
From: Administrador de Red @ 2002-12-14 17:47 UTC (permalink / raw)
To: netfilter
Hi friends
Today I install the kernel 2.4.20 for linux red hat, and
when i want to finish, i execute /etc/rc.d/init.d/iptables
status, for see the status of iptables, bu what sorprase!!
the iptables showing me the next error.
well at the end because at the begin it is show the
parameters normal(table).
tabla:mangle
iptables :libptc/libip4tc.c:384 do check assertion h->info
valid-hooks==(1<< 0 1<<3) failed
/etc/rc.d/init.d/iptables line 170: 955 abortado(abort)
iptables -t mangle --list
the when i go to the start or stop the iptables show the
following error
modprobe can't locate module iptables
iptable v1.2.3 can't initialize iptables mangle
table does not exist do you need to insmod?
perhpas iptables or you kernel need to be upgraded?
someone can I help me?.
I fell very bad for this.
sincerely Thomas
Estamos en Calle 20 Numero 4110 % 41 y 47,
Miramar, Playa, Ciudad Habana, Cuba.
Telf:537(203-01-60) y (202-79-20)
Fax: 537(204-96-64)
Visitenos en: http://www.gecyt.cu
^ permalink raw reply
* Re: Intel P6 vs P7 system call performance
From: Mike Dresser @ 2002-12-14 17:48 UTC (permalink / raw)
To: Dave Jones; +Cc: linux-kernel
In-Reply-To: <20021214100125.GA30545@suse.de>
On Sat, 14 Dec 2002, Dave Jones wrote:
> Note that there are more factors at play than raw cpu speed in a
> kernel compile. Your time here is slightly faster than my 2.8Ghz P4-HT for
> example. My guess is you have faster disk(s) than I do, as most of
> the time mine seems to be waiting for something to do.
Quantum Fireball AS's in that machine. My main comment was that his
Althon MP at 1.8 was half or less the speed of a single P4. Even with
compiler changes, I wouldn't think it would make THAT much of a
difference?
Mike
^ permalink raw reply
* Compaq Evo N160: Fixed DSDT - battstat_applet works now
From: Heiko Ettelbrueck @ 2002-12-14 17:36 UTC (permalink / raw)
To: acpi-devel-pyega4qmqnRoyOMFzWx49A
Hi all,
in short terms:
---------------
Today I fixed the DSDT of my Compaq Evo N160 so that it knows the design
capacity of its battery and allows tools like battstat_applet to
calculate the percentage of remaining capacity.
The fixed DSDT can be retrieved as
- ASL from
http://www.ettelbrueck.de/linux-acpi/compaq-evo-n160/acpi_dsdt.asl
- AML in a C sourcecode, ready to be compiled into your kernel, from
http://www.ettelbrueck.de/linux-acpi/compaq-evo-n160/acpi_dsdt.c
In more detail:
---------------
I realized why battstat_applet could not display the remaining capacity
of my Compaq Evo N160 notebook: The DSDT provided by Compaq does not
contain any information about the design capacity of the notebook, so
battstat_applet could not calculate the remaining capacity percentage.
I had a look in the ACPI specification (2.0a) and found, in chapter
11.2.2.1 on page 289, the following information about the battery
properties which should be provided by the manufacturer in his DSDT:
BIF --> Battery Information
Power Unit --> DWORD
Design Capacity --> DWORD
Last Full Charge Capacity --> DWORD
Battery Technology --> DWORD
Design Voltage --> DWORD
Design Capacity of Warning --> DWORD
Design Capacity of Low --> DWORD
Battery Capacity Granularity 1 --> DWORD
+-- between "low" and "warning"
Battery Capacity Granularity 2 --> DWORD
+-- between "warning" and "full"
Model Number --> ASCIIZ
Serial Number --> ASCIIZ
Battery Type --> ASCIIZ
OEM Information --> ASCIIZ
DWORD --> double word = four bytes (in hex: 0x00000000)
ASCIIZ --> ASCII string with null-byte (0x00) at the end
Here we have the original values of the Compaq DSDT together with some
comments from my side to show what was wrong and how it should be right
- or let's say: how it should be better ;-
0x0, --> interpret values as mW or mWh
--> WRONG! values are mA or mAh
--> CORRECT: 0x00000001
0xffffffff, --> design capacity unknown
--> WRONG! design capacity is 4000 mAh
according to value printed on battery
--> CORRECT: 0x00000fa0
0xffffffff, --> last full charge capacity unknown
--> WRONG! my own reaches 3357 mAh at the moment
--> CORRECT: 0x00000d1d
0x1, --> battery technology is rechargeable
--> CORRECT
0xffffffff, --> design voltage unknown
--> WRONG! design voltage is 14.4V = 14400mV
--> CORRECT: 0x00003840
0x0320, --> design capacity of warning is 800 mAh
--> CORRECT (?)
0x0320, --> design capacity of warning is 800 mAh
--> CORRECT (?)
--> Why does /proc/acpi/battery/*/info
show only _16_ mAh here???
0x64, --> battery capacity granularity 1 is 100 mAh
0x64, --> battery capacity granularity 2 is 100 mAh
"BAT1",
"123",
"LION",
"COMPAQ",
Feedback about my conclusions and corrections is welcome :-)
Regards,
Heiko
-------------------------------------------------------
This sf.net email is sponsored by:
With Great Power, Comes Great Responsibility
Learn to use your power at OSDN's High Performance Computing Channel
http://hpc.devchannel.org/
^ permalink raw reply
* Re: 2.5.5[01]]: Xircom Cardbus broken (PCI resource collisions)
From: ALESSANDRO.SUARDI @ 2002-12-14 17:28 UTC (permalink / raw)
To: zwane, valdis.kletnieks; +Cc: davej, pekon, linux-kernel
> On Fri, 13 Dec 2002 Valdis.Kletnieks@vt.edu wrote:
> > On Fri, 13 Dec 2002 17:36:56 GMT, Dave Jones said:
> >
> > > It's my understanding that pci_enable_device() *must* be called
> > > before we fiddle with dev->resource, dev->irq and the like.
> >
> > OK.. it looks like the problem only hits if it's a PCMCIA card *with an
> > onboard ROM*.
> Hmm i just saw this thread, which card is the non working one?;
It's a RBEM56G-100.
Sorry it took me a while to reply - Valdis' patch does fix the problem for
me, too. Awaiting for a final form of the fix in the upcoming series :)
Thanks,
--alessandro
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.