rpms/kernel/devel linux-2.6-build-deprecate-configh-include.patch, 1.8, 1.9 linux-2.6-ia64-kexec-kdump.patch, 1.2, 1.3 linux-2.6-x86-relocatable.patch, 1.7, 1.8

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Sep 22 21:56:04 UTC 2006


Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30972

Modified Files:
	linux-2.6-build-deprecate-configh-include.patch 
	linux-2.6-ia64-kexec-kdump.patch 
	linux-2.6-x86-relocatable.patch 
Log Message:
cleanup some of the config.h removals by not adding them in the first place


linux-2.6-build-deprecate-configh-include.patch:
 a/arch/alpha/kernel/setup.c                                            |    1 -
 a/arch/alpha/kernel/systbls.S                                          |    1 -
 a/arch/arm/kernel/crunch.c                                             |    1 -
 a/arch/arm/kernel/iwmmxt-notifier.c                                    |    1 -
 a/arch/arm/mach-at91rm9200/board-1arm.c                                |    1 -
 a/arch/arm/mach-at91rm9200/board-carmeva.c                             |    1 -
 a/arch/arm/mach-at91rm9200/board-eb9200.c                              |    1 -
 a/arch/arm/mach-at91rm9200/board-kafa.c                                |    1 -
 a/arch/arm/mach-at91rm9200/board-kb9202.c                              |    1 -
 a/arch/arm/mach-ep93xx/edb9302.c                                       |    1 -
 a/arch/arm/mach-ep93xx/edb9315.c                                       |    1 -
 a/arch/arm/mach-ep93xx/edb9315a.c                                      |    1 -
 a/arch/arm/mach-lh7a40x/clcd.c                                         |    2 +-
 a/arch/arm/mach-lh7a40x/clocks.c                                       |    1 -
 a/arch/arm/mach-omap2/pm-domain.c                                      |    1 -
 a/arch/arm/mach-pnx4008/gpio.c                                         |    1 -
 a/arch/arm/mach-pnx4008/sleep.S                                        |    1 -
 a/arch/arm/mach-pnx4008/time.c                                         |    1 -
 a/arch/arm/mach-pxa/leds-trizeps4.c                                    |    1 -
 a/arch/arm26/lib/ecard.S                                               |    1 -
 a/arch/arm26/lib/io-acorn.S                                            |    1 -
 a/arch/frv/kernel/time.c                                               |    1 -
 a/arch/h8300/kernel/time.c                                             |    1 -
 a/arch/m32r/mm/mmu.S                                                   |    1 -
 a/arch/m68k/kernel/time.c                                              |    1 -
 a/arch/m68knommu/platform/532x/config.c                                |    1 -
 a/arch/m68knommu/platform/68328/romvec.S                               |    2 --
 a/arch/parisc/kernel/head.S                                            |    2 --
 a/arch/parisc/kernel/syscall.S                                         |    1 -
 a/arch/powerpc/platforms/83xx/mpc834x_itx.c                            |    1 -
 a/arch/powerpc/platforms/85xx/mpc85xx_cds.c                            |    1 -
 a/arch/powerpc/platforms/cell/cbe_regs.c                               |    2 --
 a/arch/powerpc/platforms/cell/ras.c                                    |    1 -
 a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c                    |    1 -
 a/arch/powerpc/sysdev/tsi108_dev.c                                     |    1 -
 a/arch/ppc/amiga/time.c                                                |    1 -
 a/arch/ppc/platforms/4xx/cpci405.h                                     |    1 -
 a/arch/sparc/kernel/ioport.c                                           |    1 -
 a/arch/sparc/kernel/of_device.c                                        |    1 -
 a/arch/sparc64/kernel/auxio.c                                          |    1 -
 a/arch/sparc64/kernel/of_device.c                                      |    1 -
 a/arch/sparc64/kernel/prom.c                                           |    1 -
 a/arch/um/drivers/hostaudio_kern.c                                     |    1 -
 a/arch/um/drivers/net_kern.c                                           |    1 -
 a/arch/um/drivers/slip_kern.c                                          |    1 -
 a/arch/um/drivers/ssl.c                                                |    1 -
 a/arch/um/drivers/stdio_console.c                                      |    1 -
 a/arch/um/drivers/ubd_kern.c                                           |    1 -
 a/arch/um/include/mconsole_kern.h                                      |    1 -
 a/arch/um/include/mode_kern.h                                          |    2 --
 a/arch/um/include/skas/mmu-skas.h                                      |    1 -
 a/arch/um/include/sysdep-ppc/ptrace.h                                  |    1 -
 a/arch/um/include/um_uaccess.h                                         |    1 -
 a/arch/um/kernel/init_task.c                                           |    1 -
 a/arch/um/kernel/irq.c                                                 |    1 -
 a/arch/um/kernel/ksyms.c                                               |    1 -
 a/arch/um/kernel/process_kern.c                                        |    1 -
 a/arch/um/kernel/signal.c                                              |    1 -
 a/arch/um/kernel/skas/mem.c                                            |    1 -
 a/arch/um/kernel/skas/mmu.c                                            |    1 -
 a/arch/um/kernel/skas/tlb.c                                            |    1 -
 a/arch/um/kernel/smp.c                                                 |    1 -
 a/arch/um/kernel/sysrq.c                                               |    1 -
 a/arch/um/kernel/trap.c                                                |    1 -
 a/arch/um/kernel/tt/gdb_kern.c                                         |    1 -
 a/arch/um/kernel/tt/mem.c                                              |    1 -
 a/arch/um/kernel/um_arch.c                                             |    1 -
 a/arch/um/sys-i386/ldt.c                                               |    1 -
 a/arch/um/sys-i386/sysrq.c                                             |    1 -
 a/arch/um/sys-i386/tls.c                                               |    1 -
 a/arch/v850/kernel/time.c                                              |    1 -
 a/arch/x86_64/boot/video.S                                             |    2 --
 a/arch/x86_64/ia32/ia32_binfmt.c                                       |    1 -
 a/arch/x86_64/kernel/pci-calgary.c                                     |    1 -
 a/arch/x86_64/kernel/tce.c                                             |    1 -
 a/arch/x86_64/kernel/x8664_ksyms.c                                     |    1 -
 a/arch/x86_64/lib/delay.c                                              |    1 -
 a/arch/x86_64/lib/thunk.S                                              |    1 -
 a/drivers/block/cciss.c                                                |    1 -
 a/drivers/block/cpqarray.c                                             |    1 -
 a/drivers/char/ftape/lowlevel/fdc-io.c                                 |    1 -
 a/drivers/char/ftape/zftape/zftape-rw.c                                |    1 -
 a/drivers/char/ftape/zftape/zftape-rw.h                                |    1 -
 a/drivers/char/hw_random/ixp4xx-rng.c                                  |    1 -
 a/drivers/char/nsc_gpio.c                                              |    1 -
 a/drivers/char/pcmcia/synclink_cs.c                                    |    1 -
 a/drivers/char/sx.c                                                    |    2 --
 a/drivers/char/synclink.c                                              |    1 -
 a/drivers/char/watchdog/pcwd.c                                         |    1 -
 a/drivers/char/watchdog/pcwd_pci.c                                     |    1 -
 a/drivers/hwmon/w83791d.c                                              |    1 -
 a/drivers/i2c/busses/i2c-ocores.c                                      |    1 -
 a/drivers/ide/pci/generic.c                                            |    1 -
 a/drivers/ide/pci/rz1000.c                                             |    1 -
 a/drivers/leds/leds-ams-delta.c                                        |    1 -
 a/drivers/rtc/rtc-max6902.c                                            |    1 -
 a/drivers/scsi/imm.h                                                   |    1 -
 a/drivers/scsi/ppa.h                                                   |    1 -
 a/drivers/serial/cpm_uart/cpm_uart.h                                   |    1 -
 a/drivers/serial/netx-serial.c                                         |    2 --
 a/drivers/spi/spi_s3c24xx.c                                            |    1 -
 a/drivers/spi/spi_s3c24xx_gpio.c                                       |    1 -
 a/drivers/usb/input/usbtouchscreen.c                                   |    1 -
 a/drivers/usb/misc/appledisplay.c                                      |    1 -
 a/drivers/usb/misc/sisusbvga/sisusb.c                                  |    1 -
 a/drivers/usb/misc/sisusbvga/sisusb_con.c                              |    1 -
 a/fs/isofs/namei.c                                                     |    1 -
 a/fs/nfs/namespace.c                                                   |    2 --
 a/fs/nfs/nfs4namespace.c                                               |    2 --
 a/fs/nfs/nfsroot.c                                                     |    1 -
 a/fs/nfs/super.c                                                       |    1 -
 a/include/asm-arm/arch-lh7a40x/clocks.h                                |    2 --
 a/include/asm-arm/pgtable-nommu.h                                      |    1 -
 a/include/asm-powerpc/irq.h                                            |    1 -
 a/include/asm-powerpc/pci-bridge.h                                     |    1 -
 a/include/asm-x86_64/calgary.h                                         |    1 -
 a/init/do_mounts.h                                                     |    1 -
 a/kernel/rtmutex-debug.c                                               |    1 -
 a/kernel/rtmutex-tester.c                                              |    1 -
 a/mm/filemap.h                                                         |    1 -
 a/mm/slab.c                                                            |    1 -
 a/mm/vmstat.c                                                          |    1 -
 a/net/atm/atm_sysfs.c                                                  |    1 -
 a/net/core/dev_mcast.c                                                 |    1 -
 a/sound/aoa/soundbus/sysfs.c                                           |    1 -
 a/sound/core/memory.c                                                  |    1 -
 linux-2.6.17.noarch/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h |    1 -
 linux-2.6.17.noarch/drivers/net/3c501.c                                |    1 -
 linux-2.6.17.noarch/drivers/net/hp100.c                                |    1 -
 linux-2.6.17.noarch/drivers/net/irda/mcs7780.c                         |    1 -
 linux-2.6.17.noarch/drivers/net/irda/w83977af_ir.c                     |    1 -
 linux-2.6.17.noarch/drivers/net/netx-eth.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/phy/smsc.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/phy/vitesse.c                          |    1 -
 linux-2.6.17.noarch/drivers/net/smc911x.c                              |    2 --
 linux-2.6.17.noarch/drivers/net/wan/cycx_main.c                        |    1 -
 linux-2.6.17.noarch/drivers/net/wan/dlci.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/wan/sdla.c                             |    1 -
 linux-2.6.17.noarch/drivers/scsi/aic7xxx_old.c                         |    2 --
 linux-2.6.17.noarch/drivers/scsi/dpt_i2o.c                             |    1 -
 linux-2.6.17.noarch/drivers/scsi/hptiop.c                              |    1 -
 linux-2.6.17.noarch/drivers/scsi/libata-eh.c                           |    1 -
 linux-2.6.17.noarch/drivers/scsi/scsi.h                                |    2 --
 linux-2.6.17.noarch/include/asm-i386/dwarf2.h                          |    2 --
 linux-2.6.17.noarch/include/asm-i386/tsc.h                             |    1 -
 linux-2.6.17.noarch/include/linux/config.h                             |    1 +
 linux-2.6.17.noarch/include/linux/unwind.h                             |    2 --
 linux-2.6.17.noarch/include/linux/vmstat.h                             |    1 -
 linux-2.6.17.noarch/include/net/netdma.h                               |    1 -
 linux-2.6.18.noarch/arch/i386/boot/video.S                             |    2 --
 linux-2.6.18.noarch/arch/i386/kernel/nmi.c                             |    1 -
 linux-2.6.18.noarch/arch/i386/lib/delay.c                              |    1 -
 linux-2.6.18.noarch/drivers/media/video/cx88/cx88-tvaudio.c            |    1 -
 linux-2.6.18.noarch/drivers/media/video/pvrusb2/pvrusb2-main.c         |    1 -
 linux-2.6.18.noarch/drivers/media/video/pvrusb2/pvrusb2-sysfs.c        |    1 -
 linux-2.6.18.noarch/drivers/net/phy/fixed.c                            |    1 -
 linux-2.6.18.noarch/drivers/usb/input/pid.c                            |    1 -
 linux-2.6/net/core/wireless.c                                          |    1 -
 linux-2.6/net/ipv4/af_inet.c                                           |    1 -
 linux-2.6/net/ipv4/ipconfig.c                                          |    1 -
 linux-2.6/net/ipv4/netfilter/ip_conntrack_sip.c                        |    1 -
 linux-2.6/net/ipv4/raw.c                                               |    3 +--
 linux-2.6/net/ipv4/tcp_lp.c                                            |    1 -
 linux-2.6/net/ipv4/tcp_veno.c                                          |    1 -
 164 files changed, 3 insertions(+), 180 deletions(-)

Index: linux-2.6-build-deprecate-configh-include.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-deprecate-configh-include.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-build-deprecate-configh-include.patch	22 Sep 2006 00:43:10 -0000	1.8
+++ linux-2.6-build-deprecate-configh-include.patch	22 Sep 2006 21:56:01 -0000	1.9
@@ -1765,23 +1765,3 @@
  #include <linux/kernel.h>
  #include <linux/sched.h>
  #include <linux/string.h>
---- linux-2.6.18.noarch/arch/ia64/kernel/machine_kexec.c~	2006-09-21 20:25:11.000000000 -0400
-+++ linux-2.6.18.noarch/arch/ia64/kernel/machine_kexec.c	2006-09-21 20:25:19.000000000 -0400
-@@ -11,7 +11,6 @@
-  */
- 
- #include <linux/kernel.h>
--#include <linux/config.h>
- #include <linux/mm.h>
- #include <linux/kexec.h>
- #include <linux/pci.h>
---- linux-2.6.18.noarch/arch/ia64/kernel/relocate_kernel.S~	2006-09-21 20:25:23.000000000 -0400
-+++ linux-2.6.18.noarch/arch/ia64/kernel/relocate_kernel.S	2006-09-21 20:25:25.000000000 -0400
-@@ -10,7 +10,6 @@
-  * This source code is licensed under the GNU General Public License,
-  * Version 2.  See the file COPYING for more details.
-  */
--#include <linux/config.h>
- #include <asm/asmmacro.h>
- #include <asm/kregs.h>
- #include <asm/page.h>

linux-2.6-ia64-kexec-kdump.patch:
 arch/ia64/Kconfig                  |   23 +
 arch/ia64/hp/common/sba_iommu.c    |   22 +
 arch/ia64/kernel/Makefile          |    1 
 arch/ia64/kernel/crash.c           |  119 +++++++++
 arch/ia64/kernel/efi.c             |   19 +
 arch/ia64/kernel/entry.S           |    2 
 arch/ia64/kernel/iosapic.c         |   19 +
 arch/ia64/kernel/machine_kexec.c   |  138 ++++++++++
 arch/ia64/kernel/relocate_kernel.S |  489 +++++++++++++++++++++++++++++++++++++
 arch/ia64/kernel/setup.c           |   44 +++
 arch/ia64/kernel/smp.c             |   55 ++++
 include/asm-ia64/kexec.h           |   40 +++
 include/asm-ia64/machvec_hpzx1.h   |    2 
 include/asm-ia64/smp.h             |    3 
 kernel/irq/manage.c                |    1 
 15 files changed, 971 insertions(+), 6 deletions(-)

Index: linux-2.6-ia64-kexec-kdump.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ia64-kexec-kdump.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-ia64-kexec-kdump.patch	25 Aug 2006 19:18:19 -0000	1.2
+++ linux-2.6-ia64-kexec-kdump.patch	22 Sep 2006 21:56:01 -0000	1.3
@@ -318,7 +318,7 @@
 diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/machine_kexec.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/machine_kexec.c
 --- linux-2.6.18-rc4/arch/ia64/kernel/machine_kexec.c	1970-01-01 08:00:00.000000000 +0800
 +++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/machine_kexec.c	2006-08-19 12:54:10.000000000 +0800
-@@ -0,0 +1,139 @@
+@@ -0,0 +1,138 @@
 +/*
 + * arch/ia64/kernel/machine_kexec.c
 + *
@@ -332,7 +332,6 @@
 + */
 +
 +#include <linux/kernel.h>
-+#include <linux/config.h>
 +#include <linux/mm.h>
 +#include <linux/kexec.h>
 +#include <linux/pci.h>
@@ -472,7 +471,7 @@
 diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/relocate_kernel.S linux-2.6.18-rc4-kdump/arch/ia64/kernel/relocate_kernel.S
 --- linux-2.6.18-rc4/arch/ia64/kernel/relocate_kernel.S	1970-01-01 08:00:00.000000000 +0800
 +++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/relocate_kernel.S	2006-08-19 12:54:10.000000000 +0800
-@@ -0,0 +1,490 @@
+@@ -0,0 +1,489 @@
 +/*
 + * arch/ia64/kernel/relocate_kernel.S
 + *
@@ -485,7 +484,6 @@
 + * This source code is licensed under the GNU General Public License,
 + * Version 2.  See the file COPYING for more details.
 + */
-+#include <linux/config.h>
 +#include <asm/asmmacro.h>
 +#include <asm/kregs.h>
 +#include <asm/page.h>

linux-2.6-x86-relocatable.patch:
 b/arch/i386/Kconfig                                              |   13 
 b/arch/i386/Makefile                                             |    2 
 b/arch/i386/boot/Makefile                                        |    2 
 b/arch/i386/boot/bootsect.S                                      |   96 +
 b/arch/i386/boot/compressed/Makefile                             |   22 
 b/arch/i386/boot/compressed/head.S                               |  183 ++-
 b/arch/i386/boot/compressed/misc.c                               |  512 ++++++---
 b/arch/i386/boot/compressed/relocs.c                             |  563 ++++++++++
 b/arch/i386/boot/compressed/vmlinux.lds                          |   40 
 b/arch/i386/boot/compressed/vmlinux.scr                          |    3 
 b/arch/i386/boot/setup.S                                         |   29 
 b/arch/i386/boot/tools/build.c                                   |  214 +++
 b/arch/i386/kernel/alternative.c                                 |    8 
 b/arch/i386/kernel/setup.c                                       |    4 
 b/arch/i386/kernel/vmlinux.lds.S                                 |  113 +-
 b/arch/i386/mm/init.c                                            |   15 
 b/arch/x86_64/Kconfig                                            |   19 
 b/arch/x86_64/boot/Makefile                                      |    2 
 b/arch/x86_64/boot/bootsect.S                                    |   93 +
 b/arch/x86_64/boot/compressed/Makefile                           |   13 
 b/arch/x86_64/boot/compressed/head.S                             |  301 +++--
 b/arch/x86_64/boot/compressed/misc.c                             |  500 ++++++--
 b/arch/x86_64/boot/compressed/vmlinux.lds                        |   44 
 b/arch/x86_64/boot/compressed/vmlinux.scr                        |    5 
 b/arch/x86_64/boot/tools/build.c                                 |  232 +++-
 b/arch/x86_64/defconfig                                          |    1 
 b/arch/x86_64/kernel/acpi/sleep.c                                |   19 
 b/arch/x86_64/kernel/acpi/wakeup.S                               |  325 ++---
 b/arch/x86_64/kernel/e820.c                                      |    4 
 b/arch/x86_64/kernel/early_printk.c                              |    3 
 b/arch/x86_64/kernel/head.S                                      |  326 ++---
 b/arch/x86_64/kernel/head64.c                                    |   35 
 b/arch/x86_64/kernel/setup.c                                     |   24 
 b/arch/x86_64/kernel/setup64.c                                   |    1 
 b/arch/x86_64/kernel/smp.c                                       |    2 
 b/arch/x86_64/kernel/suspend.c                                   |    3 
 b/arch/x86_64/kernel/trampoline.S                                |  168 ++
 b/arch/x86_64/kernel/vmlinux.lds.S                               |    2 
 b/arch/x86_64/kernel/vsyscall.c                                  |   10 
 b/arch/x86_64/mm/fault.c                                         |    4 
 b/arch/x86_64/mm/init.c                                          |  288 ++---
 b/arch/x86_64/mm/pageattr.c                                      |   20 
 b/include/asm-generic/vmlinux.lds.h                              |    2 
 b/include/asm-i386/page.h                                        |    4 
 b/include/asm-x86_64/const.h                                     |   20 
 b/include/asm-x86_64/page.h                                      |   44 
 b/include/asm-x86_64/pgtable.h                                   |   39 
 b/include/asm-x86_64/proto.h                                     |    2 
 b/include/asm-x86_64/segment.h                                   |    4 
 b/include/asm-x86_64/suspend.h                                   |   13 
 b/include/linux/elf.h                                            |   27 
 b/include/linux/elf_boot.h                                       |   19 
 b/include/linux/screen_info.h                                    |    3 
 b/scripts/kallsyms.c                                             |   30 
 linux-2.6.17.noarch/arch/x86_64/mm/init.c                        |    2 
 linux-2.6.17.noarch/include/asm-x86_64/Kbuild                    |    2 
 linux-2.6.17.x86_64-root/fs/proc/kcore.c                         |    8 
 linux-2.6.18-rc3-1M-root/arch/i386/Kconfig                       |   34 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/bootsect.S               |    8 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/head.S        |   28 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/misc.c        |    7 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/vmlinux.lds   |    3 
 linux-2.6.18-rc3-1M-root/arch/i386/kernel/vmlinux.lds.S          |    5 
 linux-2.6.18-rc3-1M-root/arch/powerpc/kernel/vmlinux.lds.S       |    1 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/Makefile               |    3 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/compressed/vmlinux.lds |    2 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/tools/build.c          |  129 +-
 linux-2.6.18-rc3-1M-root/fs/proc/kcore.c                         |    4 
 linux-2.6.18-rc3-1M-root/include/asm-i386/boot.h                 |    6 
 69 files changed, 3396 insertions(+), 1316 deletions(-)

Index: linux-2.6-x86-relocatable.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86-relocatable.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-x86-relocatable.patch	19 Sep 2006 18:00:54 -0000	1.7
+++ linux-2.6-x86-relocatable.patch	22 Sep 2006 21:56:01 -0000	1.8
@@ -57,11 +57,10 @@
 index 011b7a4..847dc8f 100644
 --- a/arch/i386/boot/bootsect.S
 +++ b/arch/i386/boot/bootsect.S
-@@ -13,6 +13,13 @@
+@@ -13,6 +13,12 @@
   *
   */
  
-+#include <linux/config.h>
 +#include <linux/version.h>
 +#include <linux/utsrelease.h>
 +#include <linux/compile.h>
@@ -226,11 +225,10 @@
 index b5893e4..418e425 100644
 --- a/arch/i386/boot/compressed/head.S
 +++ b/arch/i386/boot/compressed/head.S
-@@ -23,12 +23,14 @@
+@@ -23,12 +23,13 @@
   */
  .text
  
-+#include <linux/config.h>
  #include <linux/linkage.h>
  #include <asm/segment.h>
  #include <asm/page.h>
@@ -454,12 +452,11 @@
 index b2ccd54..809eb93 100644
 --- a/arch/i386/boot/compressed/misc.c
 +++ b/arch/i386/boot/compressed/misc.c
-@@ -9,12 +9,97 @@
+@@ -9,12 +9,96 @@
   * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
   */
  
 +#define __init
-+#include <linux/config.h>
  #include <linux/linkage.h>
  #include <linux/vmalloc.h>
 +#include <linux/serial_reg.h>
@@ -2118,14 +2115,6 @@
 index 2d4f138..8bcf0e1 100644
 --- a/arch/i386/kernel/vmlinux.lds.S
 +++ b/arch/i386/kernel/vmlinux.lds.S
-@@ -4,6 +4,7 @@
- 
- #define LOAD_OFFSET __PAGE_OFFSET
- 
-+#include <linux/config.h>
- #include <asm-generic/vmlinux.lds.h>
- #include <asm/thread_info.h>
- #include <asm/page.h>
 @@ -15,46 +16,49 @@ ENTRY(phys_startup_32)
  }
  SECTIONS




More information about the fedora-cvs-commits mailing list