refresh kernel patches

SVN-Revision: 11193
This commit is contained in:
Gabor Juhos 2008-05-19 06:33:18 +00:00
parent 925ad245e0
commit 12dce71cd1
40 changed files with 225 additions and 225 deletions

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/arch/mips/Kconfig
Index: linux-2.6.25.4/arch/mips/Kconfig
===================================================================
--- linux-2.6.25.orig/arch/mips/Kconfig
+++ linux-2.6.25/arch/mips/Kconfig
--- linux-2.6.25.4.orig/arch/mips/Kconfig
+++ linux-2.6.25.4/arch/mips/Kconfig
@@ -18,6 +18,20 @@ choice
prompt "System type"
default SGI_IP22
@ -31,10 +31,10 @@ Index: linux-2.6.25/arch/mips/Kconfig
source "arch/mips/au1000/Kconfig"
source "arch/mips/basler/excite/Kconfig"
source "arch/mips/jazz/Kconfig"
Index: linux-2.6.25/arch/mips/Makefile
Index: linux-2.6.25.4/arch/mips/Makefile
===================================================================
--- linux-2.6.25.orig/arch/mips/Makefile
+++ linux-2.6.25/arch/mips/Makefile
--- linux-2.6.25.4.orig/arch/mips/Makefile
+++ linux-2.6.25.4/arch/mips/Makefile
@@ -174,6 +174,16 @@ cflags-$(CONFIG_MACH_JAZZ) += -Iinclude/
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
@ -52,10 +52,10 @@ Index: linux-2.6.25/arch/mips/Makefile
# Common Alchemy Au1x00 stuff
#
core-$(CONFIG_SOC_AU1X00) += arch/mips/au1000/common/
Index: linux-2.6.25/include/asm-mips/bootinfo.h
Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
===================================================================
--- linux-2.6.25.orig/include/asm-mips/bootinfo.h
+++ linux-2.6.25/include/asm-mips/bootinfo.h
--- linux-2.6.25.4.orig/include/asm-mips/bootinfo.h
+++ linux-2.6.25.4/include/asm-mips/bootinfo.h
@@ -94,6 +94,58 @@
#define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */
#define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/mtd/maps/Kconfig
Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/mtd/maps/Kconfig
+++ linux-2.6.25/drivers/mtd/maps/Kconfig
--- linux-2.6.25.4.orig/drivers/mtd/maps/Kconfig
+++ linux-2.6.25.4/drivers/mtd/maps/Kconfig
@@ -590,5 +590,9 @@ config MTD_PLATRAM
This selection automatically selects the map_ram driver.
@ -12,10 +12,10 @@ Index: linux-2.6.25/drivers/mtd/maps/Kconfig
+
endmenu
Index: linux-2.6.25/drivers/mtd/maps/Makefile
Index: linux-2.6.25.4/drivers/mtd/maps/Makefile
===================================================================
--- linux-2.6.25.orig/drivers/mtd/maps/Makefile
+++ linux-2.6.25/drivers/mtd/maps/Makefile
--- linux-2.6.25.4.orig/drivers/mtd/maps/Makefile
+++ linux-2.6.25.4/drivers/mtd/maps/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_MTD_DBOX2) += dbox2-flash.
obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
obj-$(CONFIG_MTD_PCI) += pci.o

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/net/Kconfig
Index: linux-2.6.25.4/drivers/net/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/net/Kconfig
+++ linux-2.6.25/drivers/net/Kconfig
--- linux-2.6.25.4.orig/drivers/net/Kconfig
+++ linux-2.6.25.4/drivers/net/Kconfig
@@ -606,6 +606,10 @@ config MIPS_AU1X00_ENET
If you have an Alchemy Semi AU1X00 based system
say Y. Otherwise, say N.
@ -13,10 +13,10 @@ Index: linux-2.6.25/drivers/net/Kconfig
config SGI_IOC3_ETH
bool "SGI IOC3 Ethernet"
depends on PCI && SGI_IP27
Index: linux-2.6.25/drivers/net/Makefile
Index: linux-2.6.25.4/drivers/net/Makefile
===================================================================
--- linux-2.6.25.orig/drivers/net/Makefile
+++ linux-2.6.25/drivers/net/Makefile
--- linux-2.6.25.4.orig/drivers/net/Makefile
+++ linux-2.6.25.4/drivers/net/Makefile
@@ -187,6 +187,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
# This is also a 82596 and should probably be merged
obj-$(CONFIG_LP486E) += lp486e.o

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/usb/host/Kconfig
Index: linux-2.6.25.4/drivers/usb/host/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/usb/host/Kconfig
+++ linux-2.6.25/drivers/usb/host/Kconfig
--- linux-2.6.25.4.orig/drivers/usb/host/Kconfig
+++ linux-2.6.25.4/drivers/usb/host/Kconfig
@@ -260,3 +260,6 @@ config USB_R8A66597_HCD
To compile this driver as a module, choose M here: the
module will be called r8a66597-hcd.
@ -9,10 +9,10 @@ Index: linux-2.6.25/drivers/usb/host/Kconfig
+config USB_ADM5120_HCD
+ tristate "ADM5120 HCD support (EXPERIMENTAL)"
+ depends on USB && MIPS_ADM5120 && EXPERIMENTAL
Index: linux-2.6.25/drivers/usb/host/Makefile
Index: linux-2.6.25.4/drivers/usb/host/Makefile
===================================================================
--- linux-2.6.25.orig/drivers/usb/host/Makefile
+++ linux-2.6.25/drivers/usb/host/Makefile
--- linux-2.6.25.4.orig/drivers/usb/host/Makefile
+++ linux-2.6.25.4/drivers/usb/host/Makefile
@@ -8,6 +8,7 @@ endif
obj-$(CONFIG_PCI) += pci-quirks.o
@ -21,10 +21,10 @@ Index: linux-2.6.25/drivers/usb/host/Makefile
obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o
Index: linux-2.6.25/drivers/usb/Makefile
Index: linux-2.6.25.4/drivers/usb/Makefile
===================================================================
--- linux-2.6.25.orig/drivers/usb/Makefile
+++ linux-2.6.25/drivers/usb/Makefile
--- linux-2.6.25.4.orig/drivers/usb/Makefile
+++ linux-2.6.25.4/drivers/usb/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_USB_UHCI_HCD) += host/
obj-$(CONFIG_USB_SL811_HCD) += host/
obj-$(CONFIG_USB_U132_HCD) += host/

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/leds/Kconfig
Index: linux-2.6.25.4/drivers/leds/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/leds/Kconfig
+++ linux-2.6.25/drivers/leds/Kconfig
--- linux-2.6.25.4.orig/drivers/leds/Kconfig
+++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -25,6 +25,21 @@ config LEDS_ATMEL_PWM
This option enables support for LEDs driven using outputs
of the dedicated PWM controller found on newer Atmel SOCs.
@ -24,10 +24,10 @@ Index: linux-2.6.25/drivers/leds/Kconfig
config LEDS_CORGI
tristate "LED Support for the Sharp SL-C7x0 series"
depends on LEDS_CLASS && PXA_SHARP_C7xx
Index: linux-2.6.25/drivers/leds/Makefile
Index: linux-2.6.25.4/drivers/leds/Makefile
===================================================================
--- linux-2.6.25.orig/drivers/leds/Makefile
+++ linux-2.6.25/drivers/leds/Makefile
--- linux-2.6.25.4.orig/drivers/leds/Makefile
+++ linux-2.6.25.4/drivers/leds/Makefile
@@ -5,6 +5,7 @@ obj-$(CONFIG_LEDS_CLASS) += led-class.o
obj-$(CONFIG_LEDS_TRIGGERS) += led-triggers.o

View file

@ -1,16 +1,16 @@
Index: linux-2.6.25/arch/mips/pci/Makefile
Index: linux-2.6.25.4/arch/mips/pci/Makefile
===================================================================
--- linux-2.6.25.orig/arch/mips/pci/Makefile
+++ linux-2.6.25/arch/mips/pci/Makefile
--- linux-2.6.25.4.orig/arch/mips/pci/Makefile
+++ linux-2.6.25.4/arch/mips/pci/Makefile
@@ -48,3 +48,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-
obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
+obj-$(CONFIG_PCI_ADM5120) += pci-adm5120.o
Index: linux-2.6.25/include/linux/pci_ids.h
Index: linux-2.6.25.4/include/linux/pci_ids.h
===================================================================
--- linux-2.6.25.orig/include/linux/pci_ids.h
+++ linux-2.6.25/include/linux/pci_ids.h
--- linux-2.6.25.4.orig/include/linux/pci_ids.h
+++ linux-2.6.25.4/include/linux/pci_ids.h
@@ -1704,6 +1704,9 @@
#define PCI_VENDOR_ID_ESDGMBH 0x12fe
#define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/leds/Kconfig
Index: linux-2.6.25.4/drivers/leds/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/leds/Kconfig
+++ linux-2.6.25/drivers/leds/Kconfig
--- linux-2.6.25.4.orig/drivers/leds/Kconfig
+++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -213,4 +213,12 @@ config LEDS_TRIGGER_DEFAULT_ON
This allows LEDs to be initialised in the ON state.
If unsure, say Y.
@ -15,10 +15,10 @@ Index: linux-2.6.25/drivers/leds/Kconfig
+ If unsure, say N.
+
endif # NEW_LEDS
Index: linux-2.6.25/drivers/leds/Makefile
Index: linux-2.6.25.4/drivers/leds/Makefile
===================================================================
--- linux-2.6.25.orig/drivers/leds/Makefile
+++ linux-2.6.25/drivers/leds/Makefile
--- linux-2.6.25.4.orig/drivers/leds/Makefile
+++ linux-2.6.25.4/drivers/leds/Makefile
@@ -30,3 +30,4 @@ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += l
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/mtd/Kconfig
Index: linux-2.6.25.4/drivers/mtd/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/mtd/Kconfig
+++ linux-2.6.25/drivers/mtd/Kconfig
--- linux-2.6.25.4.orig/drivers/mtd/Kconfig
+++ linux-2.6.25.4/drivers/mtd/Kconfig
@@ -168,6 +168,22 @@ config MTD_OF_PARTS
the partition map from the children of the flash node,
as described in Documentation/powerpc/booting-without-of.txt.
@ -25,10 +25,10 @@ Index: linux-2.6.25/drivers/mtd/Kconfig
comment "User Modules And Translation Layers"
config MTD_CHAR
Index: linux-2.6.25/drivers/mtd/Makefile
Index: linux-2.6.25.4/drivers/mtd/Makefile
===================================================================
--- linux-2.6.25.orig/drivers/mtd/Makefile
+++ linux-2.6.25/drivers/mtd/Makefile
--- linux-2.6.25.4.orig/drivers/mtd/Makefile
+++ linux-2.6.25.4/drivers/mtd/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c
Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
===================================================================
--- linux-2.6.25.orig/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c
--- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -47,12 +47,19 @@
#define MANUFACTURER_AMD 0x0001
#define MANUFACTURER_ATMEL 0x001F
@ -74,10 +74,10 @@ Index: linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c
{ 0, 0, NULL, NULL }
};
Index: linux-2.6.25/drivers/mtd/chips/Kconfig
Index: linux-2.6.25.4/drivers/mtd/chips/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/mtd/chips/Kconfig
+++ linux-2.6.25/drivers/mtd/chips/Kconfig
--- linux-2.6.25.4.orig/drivers/mtd/chips/Kconfig
+++ linux-2.6.25.4/drivers/mtd/chips/Kconfig
@@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD
provides support for one of those command sets, used on chips
including the AMD Am29LV320.

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/mtd/chips/jedec_probe.c
Index: linux-2.6.25.4/drivers/mtd/chips/jedec_probe.c
===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/chips/jedec_probe.c
+++ linux-2.6.25.1/drivers/mtd/chips/jedec_probe.c
--- linux-2.6.25.4.orig/drivers/mtd/chips/jedec_probe.c
+++ linux-2.6.25.4/drivers/mtd/chips/jedec_probe.c
@@ -121,6 +121,10 @@
#define UPD29F064115 0x221C

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/mtd/Kconfig
Index: linux-2.6.25.4/drivers/mtd/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/mtd/Kconfig
+++ linux-2.6.25/drivers/mtd/Kconfig
--- linux-2.6.25.4.orig/drivers/mtd/Kconfig
+++ linux-2.6.25.4/drivers/mtd/Kconfig
@@ -57,6 +57,11 @@ config MTD_ROOTFS_SPLIT
depends on MTD_PARTITIONS
default y
@ -14,10 +14,10 @@ Index: linux-2.6.25/drivers/mtd/Kconfig
config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing"
depends on MTD_PARTITIONS
Index: linux-2.6.25/drivers/mtd/Makefile
Index: linux-2.6.25.4/drivers/mtd/Makefile
===================================================================
--- linux-2.6.25.orig/drivers/mtd/Makefile
+++ linux-2.6.25/drivers/mtd/Makefile
--- linux-2.6.25.4.orig/drivers/mtd/Makefile
+++ linux-2.6.25.4/drivers/mtd/Makefile
@@ -8,6 +8,7 @@ mtd-y := mtdcore.o mtdsuper.o
mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/ata/Makefile
Index: linux-2.6.25.4/drivers/ata/Makefile
===================================================================
--- linux-2.6.25.orig/drivers/ata/Makefile
+++ linux-2.6.25/drivers/ata/Makefile
--- linux-2.6.25.4.orig/drivers/ata/Makefile
+++ linux-2.6.25.4/drivers/ata/Makefile
@@ -71,6 +71,7 @@ obj-$(CONFIG_PATA_BF54X) += pata_bf54x.o
obj-$(CONFIG_PATA_PLATFORM) += pata_platform.o
obj-$(CONFIG_PATA_OF_PLATFORM) += pata_of_platform.o
@ -10,10 +10,10 @@ Index: linux-2.6.25/drivers/ata/Makefile
# Should be last but two libata driver
obj-$(CONFIG_PATA_ACPI) += pata_acpi.o
# Should be last but one libata driver
Index: linux-2.6.25/drivers/ata/Kconfig
Index: linux-2.6.25.4/drivers/ata/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/ata/Kconfig
+++ linux-2.6.25/drivers/ata/Kconfig
--- linux-2.6.25.4.orig/drivers/ata/Kconfig
+++ linux-2.6.25.4/drivers/ata/Kconfig
@@ -679,4 +679,13 @@ config PATA_BF54X
If unsure, say N.

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/arch/mips/kernel/head.S
Index: linux-2.6.25.4/arch/mips/kernel/head.S
===================================================================
--- linux-2.6.25.orig/arch/mips/kernel/head.S
+++ linux-2.6.25/arch/mips/kernel/head.S
--- linux-2.6.25.4.orig/arch/mips/kernel/head.S
+++ linux-2.6.25.4/arch/mips/kernel/head.S
@@ -126,7 +126,12 @@
/*
* Reserved space for exception handlers.

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/serial/amba-pl010.c
Index: linux-2.6.25.4/drivers/serial/amba-pl010.c
===================================================================
--- linux-2.6.25.orig/drivers/serial/amba-pl010.c
+++ linux-2.6.25/drivers/serial/amba-pl010.c
--- linux-2.6.25.4.orig/drivers/serial/amba-pl010.c
+++ linux-2.6.25.4/drivers/serial/amba-pl010.c
@@ -52,11 +52,10 @@
#include <asm/io.h>
@ -264,10 +264,10 @@ Index: linux-2.6.25/drivers/serial/amba-pl010.c
.cons = AMBA_CONSOLE,
};
Index: linux-2.6.25/drivers/serial/Kconfig
Index: linux-2.6.25.4/drivers/serial/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/serial/Kconfig
+++ linux-2.6.25/drivers/serial/Kconfig
--- linux-2.6.25.4.orig/drivers/serial/Kconfig
+++ linux-2.6.25.4/drivers/serial/Kconfig
@@ -287,10 +287,25 @@ config SERIAL_AMBA_PL010
help
This selects the ARM(R) AMBA(R) PrimeCell PL010 UART. If you have

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/amba/bus.c
Index: linux-2.6.25.4/drivers/amba/bus.c
===================================================================
--- linux-2.6.25.orig/drivers/amba/bus.c
+++ linux-2.6.25/drivers/amba/bus.c
--- linux-2.6.25.4.orig/drivers/amba/bus.c
+++ linux-2.6.25.4/drivers/amba/bus.c
@@ -17,6 +17,10 @@
#include <asm/io.h>
#include <asm/sizes.h>

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/pci/Kconfig
Index: linux-2.6.25.4/drivers/pci/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/pci/Kconfig
+++ linux-2.6.25/drivers/pci/Kconfig
--- linux-2.6.25.4.orig/drivers/pci/Kconfig
+++ linux-2.6.25.4/drivers/pci/Kconfig
@@ -42,6 +42,12 @@ config PCI_DEBUG
When in doubt, say N.
@ -15,10 +15,10 @@ Index: linux-2.6.25/drivers/pci/Kconfig
config HT_IRQ
bool "Interrupts on hypertransport devices"
default y
Index: linux-2.6.25/drivers/pci/quirks.c
Index: linux-2.6.25.4/drivers/pci/quirks.c
===================================================================
--- linux-2.6.25.orig/drivers/pci/quirks.c
+++ linux-2.6.25/drivers/pci/quirks.c
--- linux-2.6.25.4.orig/drivers/pci/quirks.c
+++ linux-2.6.25.4/drivers/pci/quirks.c
@@ -24,6 +24,7 @@
#include <linux/kallsyms.h>
#include "pci.h"

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/leds/leds-gpio.c
Index: linux-2.6.25.4/drivers/leds/leds-gpio.c
===================================================================
--- linux-2.6.25.orig/drivers/leds/leds-gpio.c
+++ linux-2.6.25/drivers/leds/leds-gpio.c
--- linux-2.6.25.4.orig/drivers/leds/leds-gpio.c
+++ linux-2.6.25.4/drivers/leds/leds-gpio.c
@@ -41,13 +41,17 @@ static void gpio_led_set(struct led_clas
container_of(led_cdev, struct gpio_led_data, cdev);
int level;

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/watchdog/Kconfig
Index: linux-2.6.25.4/drivers/watchdog/Kconfig
===================================================================
--- linux-2.6.25.orig/drivers/watchdog/Kconfig
+++ linux-2.6.25/drivers/watchdog/Kconfig
--- linux-2.6.25.4.orig/drivers/watchdog/Kconfig
+++ linux-2.6.25.4/drivers/watchdog/Kconfig
@@ -619,6 +619,18 @@ config SBC_EPX_C3_WATCHDOG
# MIPS Architecture
@ -21,10 +21,10 @@ Index: linux-2.6.25/drivers/watchdog/Kconfig
config INDYDOG
tristate "Indy/I2 Hardware Watchdog"
depends on SGI_HAS_INDYDOG
Index: linux-2.6.25/drivers/watchdog/Makefile
Index: linux-2.6.25.4/drivers/watchdog/Makefile
===================================================================
--- linux-2.6.25.orig/drivers/watchdog/Makefile
+++ linux-2.6.25/drivers/watchdog/Makefile
--- linux-2.6.25.4.orig/drivers/watchdog/Makefile
+++ linux-2.6.25.4/drivers/watchdog/Makefile
@@ -90,6 +90,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
# M68KNOMMU Architecture

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/usb/host/adm5120-hcd.c
Index: linux-2.6.25.4/drivers/usb/host/adm5120-hcd.c
===================================================================
--- linux-2.6.25.orig/drivers/usb/host/adm5120-hcd.c
+++ linux-2.6.25/drivers/usb/host/adm5120-hcd.c
--- linux-2.6.25.4.orig/drivers/usb/host/adm5120-hcd.c
+++ linux-2.6.25.4/drivers/usb/host/adm5120-hcd.c
@@ -45,7 +45,7 @@
#include "../core/hcd.h"
#include "../core/hub.h"

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/usb/host/adm5120-dbg.c
Index: linux-2.6.25.4/drivers/usb/host/adm5120-dbg.c
===================================================================
--- linux-2.6.25.orig/drivers/usb/host/adm5120-dbg.c
+++ linux-2.6.25/drivers/usb/host/adm5120-dbg.c
--- linux-2.6.25.4.orig/drivers/usb/host/adm5120-dbg.c
+++ linux-2.6.25.4/drivers/usb/host/adm5120-dbg.c
@@ -456,7 +456,7 @@ show_list(struct admhcd *ahcd, char *buf
}

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/drivers/usb/host/adm5120.h
Index: linux-2.6.25.4/drivers/usb/host/adm5120.h
===================================================================
--- linux-2.6.25.orig/drivers/usb/host/adm5120.h
+++ linux-2.6.25/drivers/usb/host/adm5120.h
--- linux-2.6.25.4.orig/drivers/usb/host/adm5120.h
+++ linux-2.6.25.4/drivers/usb/host/adm5120.h
@@ -431,6 +431,13 @@ struct admhcd {
#define OHCI_QUIRK_BE_MMIO 0x10 /* BE registers */
#define OHCI_QUIRK_ZFMICRO 0x20 /* Compaq ZFMicro chipset*/
@ -16,10 +16,10 @@ Index: linux-2.6.25/drivers/usb/host/adm5120.h
};
/* convert between an hcd pointer and the corresponding ahcd_hcd */
Index: linux-2.6.25/drivers/usb/host/adm5120-hcd.c
Index: linux-2.6.25.4/drivers/usb/host/adm5120-hcd.c
===================================================================
--- linux-2.6.25.orig/drivers/usb/host/adm5120-hcd.c
+++ linux-2.6.25/drivers/usb/host/adm5120-hcd.c
--- linux-2.6.25.4.orig/drivers/usb/host/adm5120-hcd.c
+++ linux-2.6.25.4/drivers/usb/host/adm5120-hcd.c
@@ -35,6 +35,7 @@
#include <linux/dma-mapping.h>
#include <linux/dmapool.h>
@ -66,10 +66,10 @@ Index: linux-2.6.25/drivers/usb/host/adm5120-hcd.c
}
module_exit(admhc_hcd_mod_exit);
Index: linux-2.6.25/drivers/usb/host/adm5120-dbg.c
Index: linux-2.6.25.4/drivers/usb/host/adm5120-dbg.c
===================================================================
--- linux-2.6.25.orig/drivers/usb/host/adm5120-dbg.c
+++ linux-2.6.25/drivers/usb/host/adm5120-dbg.c
--- linux-2.6.25.4.orig/drivers/usb/host/adm5120-dbg.c
+++ linux-2.6.25.4/drivers/usb/host/adm5120-dbg.c
@@ -390,6 +390,42 @@ static inline void remove_debug_files(st
#else

View file

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/ata/pata_rb153_cf.c
Index: linux-2.6.25.4/drivers/ata/pata_rb153_cf.c
===================================================================
--- linux-2.6.25.1.orig/drivers/ata/pata_rb153_cf.c
+++ linux-2.6.25.1/drivers/ata/pata_rb153_cf.c
--- linux-2.6.25.4.orig/drivers/ata/pata_rb153_cf.c
+++ linux-2.6.25.4/drivers/ata/pata_rb153_cf.c
@@ -68,20 +68,23 @@ static void rb153_pata_exec_command(stru
rb153_pata_finish_io(ap);
}

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/arch/mips/Kconfig
Index: linux-2.6.24.7/arch/mips/Kconfig
===================================================================
--- linux-2.6.24.2.orig/arch/mips/Kconfig
+++ linux-2.6.24.2/arch/mips/Kconfig
--- linux-2.6.24.7.orig/arch/mips/Kconfig
+++ linux-2.6.24.7/arch/mips/Kconfig
@@ -16,6 +16,20 @@ choice
prompt "System type"
default SGI_IP22
@ -31,10 +31,10 @@ Index: linux-2.6.24.2/arch/mips/Kconfig
source "arch/mips/au1000/Kconfig"
source "arch/mips/jazz/Kconfig"
source "arch/mips/lasat/Kconfig"
Index: linux-2.6.24.2/arch/mips/Makefile
Index: linux-2.6.24.7/arch/mips/Makefile
===================================================================
--- linux-2.6.24.2.orig/arch/mips/Makefile
+++ linux-2.6.24.2/arch/mips/Makefile
--- linux-2.6.24.7.orig/arch/mips/Makefile
+++ linux-2.6.24.7/arch/mips/Makefile
@@ -166,6 +166,16 @@ cflags-$(CONFIG_MACH_JAZZ) += -Iinclude/
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
@ -52,10 +52,10 @@ Index: linux-2.6.24.2/arch/mips/Makefile
# Common Alchemy Au1x00 stuff
#
core-$(CONFIG_SOC_AU1X00) += arch/mips/au1000/common/
Index: linux-2.6.24.2/include/asm-mips/bootinfo.h
Index: linux-2.6.24.7/include/asm-mips/bootinfo.h
===================================================================
--- linux-2.6.24.2.orig/include/asm-mips/bootinfo.h
+++ linux-2.6.24.2/include/asm-mips/bootinfo.h
--- linux-2.6.24.7.orig/include/asm-mips/bootinfo.h
+++ linux-2.6.24.7/include/asm-mips/bootinfo.h
@@ -198,6 +198,58 @@
#define MACH_GROUP_BRCM 23 /* Broadcom */
#define MACH_BCM47XX 1 /* Broadcom BCM47XX */

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/mtd/maps/Kconfig
Index: linux-2.6.24.7/drivers/mtd/maps/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/mtd/maps/Kconfig
+++ linux-2.6.24.2/drivers/mtd/maps/Kconfig
--- linux-2.6.24.7.orig/drivers/mtd/maps/Kconfig
+++ linux-2.6.24.7/drivers/mtd/maps/Kconfig
@@ -597,5 +597,9 @@ config MTD_PLATRAM
This selection automatically selects the map_ram driver.
@ -12,10 +12,10 @@ Index: linux-2.6.24.2/drivers/mtd/maps/Kconfig
+
endmenu
Index: linux-2.6.24.2/drivers/mtd/maps/Makefile
Index: linux-2.6.24.7/drivers/mtd/maps/Makefile
===================================================================
--- linux-2.6.24.2.orig/drivers/mtd/maps/Makefile
+++ linux-2.6.24.2/drivers/mtd/maps/Makefile
--- linux-2.6.24.7.orig/drivers/mtd/maps/Makefile
+++ linux-2.6.24.7/drivers/mtd/maps/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_MTD_DBOX2) += dbox2-flash.
obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
obj-$(CONFIG_MTD_PCI) += pci.o

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/net/Kconfig
Index: linux-2.6.24.7/drivers/net/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/net/Kconfig
+++ linux-2.6.24.2/drivers/net/Kconfig
--- linux-2.6.24.7.orig/drivers/net/Kconfig
+++ linux-2.6.24.7/drivers/net/Kconfig
@@ -601,6 +601,10 @@ config MIPS_AU1X00_ENET
If you have an Alchemy Semi AU1X00 based system
say Y. Otherwise, say N.
@ -13,10 +13,10 @@ Index: linux-2.6.24.2/drivers/net/Kconfig
config SGI_IOC3_ETH
bool "SGI IOC3 Ethernet"
depends on PCI && SGI_IP27
Index: linux-2.6.24.2/drivers/net/Makefile
Index: linux-2.6.24.7/drivers/net/Makefile
===================================================================
--- linux-2.6.24.2.orig/drivers/net/Makefile
+++ linux-2.6.24.2/drivers/net/Makefile
--- linux-2.6.24.7.orig/drivers/net/Makefile
+++ linux-2.6.24.7/drivers/net/Makefile
@@ -183,6 +183,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
# This is also a 82596 and should probably be merged
obj-$(CONFIG_LP486E) += lp486e.o

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/usb/host/Kconfig
Index: linux-2.6.24.7/drivers/usb/host/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/usb/host/Kconfig
+++ linux-2.6.24.2/drivers/usb/host/Kconfig
--- linux-2.6.24.7.orig/drivers/usb/host/Kconfig
+++ linux-2.6.24.7/drivers/usb/host/Kconfig
@@ -261,3 +261,6 @@ config USB_R8A66597_HCD
To compile this driver as a module, choose M here: the
module will be called r8a66597-hcd.
@ -9,10 +9,10 @@ Index: linux-2.6.24.2/drivers/usb/host/Kconfig
+config USB_ADM5120_HCD
+ tristate "ADM5120 HCD support (EXPERIMENTAL)"
+ depends on USB && MIPS_ADM5120 && EXPERIMENTAL
Index: linux-2.6.24.2/drivers/usb/host/Makefile
Index: linux-2.6.24.7/drivers/usb/host/Makefile
===================================================================
--- linux-2.6.24.2.orig/drivers/usb/host/Makefile
+++ linux-2.6.24.2/drivers/usb/host/Makefile
--- linux-2.6.24.7.orig/drivers/usb/host/Makefile
+++ linux-2.6.24.7/drivers/usb/host/Makefile
@@ -8,6 +8,7 @@ endif
obj-$(CONFIG_PCI) += pci-quirks.o
@ -21,10 +21,10 @@ Index: linux-2.6.24.2/drivers/usb/host/Makefile
obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o
Index: linux-2.6.24.2/drivers/usb/Makefile
Index: linux-2.6.24.7/drivers/usb/Makefile
===================================================================
--- linux-2.6.24.2.orig/drivers/usb/Makefile
+++ linux-2.6.24.2/drivers/usb/Makefile
--- linux-2.6.24.7.orig/drivers/usb/Makefile
+++ linux-2.6.24.7/drivers/usb/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_USB_UHCI_HCD) += host/
obj-$(CONFIG_USB_SL811_HCD) += host/
obj-$(CONFIG_USB_U132_HCD) += host/

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/leds/Kconfig
Index: linux-2.6.24.7/drivers/leds/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/leds/Kconfig
+++ linux-2.6.24.2/drivers/leds/Kconfig
--- linux-2.6.24.7.orig/drivers/leds/Kconfig
+++ linux-2.6.24.7/drivers/leds/Kconfig
@@ -18,6 +18,21 @@ config LEDS_CLASS
comment "LED drivers"
@ -24,10 +24,10 @@ Index: linux-2.6.24.2/drivers/leds/Kconfig
config LEDS_CORGI
tristate "LED Support for the Sharp SL-C7x0 series"
depends on LEDS_CLASS && PXA_SHARP_C7xx
Index: linux-2.6.24.2/drivers/leds/Makefile
Index: linux-2.6.24.7/drivers/leds/Makefile
===================================================================
--- linux-2.6.24.2.orig/drivers/leds/Makefile
+++ linux-2.6.24.2/drivers/leds/Makefile
--- linux-2.6.24.7.orig/drivers/leds/Makefile
+++ linux-2.6.24.7/drivers/leds/Makefile
@@ -5,6 +5,7 @@ obj-$(CONFIG_LEDS_CLASS) += led-class.o
obj-$(CONFIG_LEDS_TRIGGERS) += led-triggers.o

View file

@ -1,16 +1,16 @@
Index: linux-2.6.24.2/arch/mips/pci/Makefile
Index: linux-2.6.24.7/arch/mips/pci/Makefile
===================================================================
--- linux-2.6.24.2.orig/arch/mips/pci/Makefile
+++ linux-2.6.24.2/arch/mips/pci/Makefile
--- linux-2.6.24.7.orig/arch/mips/pci/Makefile
+++ linux-2.6.24.7/arch/mips/pci/Makefile
@@ -48,3 +48,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-
obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
+obj-$(CONFIG_PCI_ADM5120) += pci-adm5120.o
Index: linux-2.6.24.2/include/linux/pci_ids.h
Index: linux-2.6.24.7/include/linux/pci_ids.h
===================================================================
--- linux-2.6.24.2.orig/include/linux/pci_ids.h
+++ linux-2.6.24.2/include/linux/pci_ids.h
--- linux-2.6.24.7.orig/include/linux/pci_ids.h
+++ linux-2.6.24.7/include/linux/pci_ids.h
@@ -1703,6 +1703,9 @@
#define PCI_VENDOR_ID_ESDGMBH 0x12fe
#define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/leds/Kconfig
Index: linux-2.6.24.7/drivers/leds/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/leds/Kconfig
+++ linux-2.6.24.2/drivers/leds/Kconfig
--- linux-2.6.24.7.orig/drivers/leds/Kconfig
+++ linux-2.6.24.7/drivers/leds/Kconfig
@@ -178,4 +178,12 @@ config LEDS_TRIGGER_DEFAULT_ON
This allows LEDs to be initialised in the ON state.
If unsure, say Y.
@ -15,10 +15,10 @@ Index: linux-2.6.24.2/drivers/leds/Kconfig
+ If unsure, say N.
+
endif # NEW_LEDS
Index: linux-2.6.24.2/drivers/leds/Makefile
Index: linux-2.6.24.7/drivers/leds/Makefile
===================================================================
--- linux-2.6.24.2.orig/drivers/leds/Makefile
+++ linux-2.6.24.2/drivers/leds/Makefile
--- linux-2.6.24.7.orig/drivers/leds/Makefile
+++ linux-2.6.24.7/drivers/leds/Makefile
@@ -28,3 +28,4 @@ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += l
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/mtd/Kconfig
Index: linux-2.6.24.7/drivers/mtd/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/mtd/Kconfig
+++ linux-2.6.24.2/drivers/mtd/Kconfig
--- linux-2.6.24.7.orig/drivers/mtd/Kconfig
+++ linux-2.6.24.7/drivers/mtd/Kconfig
@@ -160,6 +160,22 @@ config MTD_AFS_PARTS
for your particular device. It won't happen automatically. The
'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
@ -25,10 +25,10 @@ Index: linux-2.6.24.2/drivers/mtd/Kconfig
comment "User Modules And Translation Layers"
config MTD_CHAR
Index: linux-2.6.24.2/drivers/mtd/Makefile
Index: linux-2.6.24.7/drivers/mtd/Makefile
===================================================================
--- linux-2.6.24.2.orig/drivers/mtd/Makefile
+++ linux-2.6.24.2/drivers/mtd/Makefile
--- linux-2.6.24.7.orig/drivers/mtd/Makefile
+++ linux-2.6.24.7/drivers/mtd/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/mtd/chips/cfi_cmdset_0002.c
Index: linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0002.c
===================================================================
--- linux-2.6.24.2.orig/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux-2.6.24.2/drivers/mtd/chips/cfi_cmdset_0002.c
--- linux-2.6.24.7.orig/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -47,12 +47,19 @@
#define MANUFACTURER_AMD 0x0001
#define MANUFACTURER_ATMEL 0x001F
@ -74,10 +74,10 @@ Index: linux-2.6.24.2/drivers/mtd/chips/cfi_cmdset_0002.c
{ 0, 0, NULL, NULL }
};
static struct cfi_fixup jedec_fixup_table[] = {
Index: linux-2.6.24.2/drivers/mtd/chips/Kconfig
Index: linux-2.6.24.7/drivers/mtd/chips/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/mtd/chips/Kconfig
+++ linux-2.6.24.2/drivers/mtd/chips/Kconfig
--- linux-2.6.24.7.orig/drivers/mtd/chips/Kconfig
+++ linux-2.6.24.7/drivers/mtd/chips/Kconfig
@@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD
provides support for one of those command sets, used on chips
including the AMD Am29LV320.

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/mtd/chips/jedec_probe.c
Index: linux-2.6.24.7/drivers/mtd/chips/jedec_probe.c
===================================================================
--- linux-2.6.24.2.orig/drivers/mtd/chips/jedec_probe.c
+++ linux-2.6.24.2/drivers/mtd/chips/jedec_probe.c
--- linux-2.6.24.7.orig/drivers/mtd/chips/jedec_probe.c
+++ linux-2.6.24.7/drivers/mtd/chips/jedec_probe.c
@@ -121,6 +121,10 @@
#define UPD29F064115 0x221C

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/mtd/Kconfig
Index: linux-2.6.24.7/drivers/mtd/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/mtd/Kconfig
+++ linux-2.6.24.2/drivers/mtd/Kconfig
--- linux-2.6.24.7.orig/drivers/mtd/Kconfig
+++ linux-2.6.24.7/drivers/mtd/Kconfig
@@ -57,6 +57,11 @@ config MTD_ROOTFS_SPLIT
depends on MTD_PARTITIONS
default y
@ -14,10 +14,10 @@ Index: linux-2.6.24.2/drivers/mtd/Kconfig
config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing"
depends on MTD_PARTITIONS
Index: linux-2.6.24.2/drivers/mtd/Makefile
Index: linux-2.6.24.7/drivers/mtd/Makefile
===================================================================
--- linux-2.6.24.2.orig/drivers/mtd/Makefile
+++ linux-2.6.24.2/drivers/mtd/Makefile
--- linux-2.6.24.7.orig/drivers/mtd/Makefile
+++ linux-2.6.24.7/drivers/mtd/Makefile
@@ -8,6 +8,7 @@ mtd-y := mtdcore.o mtdsuper.o
mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/ata/Makefile
Index: linux-2.6.24.7/drivers/ata/Makefile
===================================================================
--- linux-2.6.24.2.orig/drivers/ata/Makefile
+++ linux-2.6.24.2/drivers/ata/Makefile
--- linux-2.6.24.7.orig/drivers/ata/Makefile
+++ linux-2.6.24.7/drivers/ata/Makefile
@@ -69,6 +69,7 @@ obj-$(CONFIG_PATA_BF54X) += pata_bf54x.o
obj-$(CONFIG_PATA_PLATFORM) += pata_platform.o
obj-$(CONFIG_PATA_OF_PLATFORM) += pata_of_platform.o
@ -10,10 +10,10 @@ Index: linux-2.6.24.2/drivers/ata/Makefile
# Should be last but two libata driver
obj-$(CONFIG_PATA_ACPI) += pata_acpi.o
# Should be last but one libata driver
Index: linux-2.6.24.2/drivers/ata/Kconfig
Index: linux-2.6.24.7/drivers/ata/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/ata/Kconfig
+++ linux-2.6.24.2/drivers/ata/Kconfig
--- linux-2.6.24.7.orig/drivers/ata/Kconfig
+++ linux-2.6.24.7/drivers/ata/Kconfig
@@ -660,4 +660,13 @@ config PATA_BF54X
If unsure, say N.

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/arch/mips/kernel/head.S
Index: linux-2.6.24.7/arch/mips/kernel/head.S
===================================================================
--- linux-2.6.24.2.orig/arch/mips/kernel/head.S
+++ linux-2.6.24.2/arch/mips/kernel/head.S
--- linux-2.6.24.7.orig/arch/mips/kernel/head.S
+++ linux-2.6.24.7/arch/mips/kernel/head.S
@@ -126,7 +126,12 @@
/*
* Reserved space for exception handlers.

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/serial/amba-pl010.c
Index: linux-2.6.24.7/drivers/serial/amba-pl010.c
===================================================================
--- linux-2.6.24.2.orig/drivers/serial/amba-pl010.c
+++ linux-2.6.24.2/drivers/serial/amba-pl010.c
--- linux-2.6.24.7.orig/drivers/serial/amba-pl010.c
+++ linux-2.6.24.7/drivers/serial/amba-pl010.c
@@ -52,11 +52,10 @@
#include <asm/io.h>
@ -264,10 +264,10 @@ Index: linux-2.6.24.2/drivers/serial/amba-pl010.c
.cons = AMBA_CONSOLE,
};
Index: linux-2.6.24.2/drivers/serial/Kconfig
Index: linux-2.6.24.7/drivers/serial/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/serial/Kconfig
+++ linux-2.6.24.2/drivers/serial/Kconfig
--- linux-2.6.24.7.orig/drivers/serial/Kconfig
+++ linux-2.6.24.7/drivers/serial/Kconfig
@@ -287,10 +287,25 @@ config SERIAL_AMBA_PL010
help
This selects the ARM(R) AMBA(R) PrimeCell PL010 UART. If you have

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/amba/bus.c
Index: linux-2.6.24.7/drivers/amba/bus.c
===================================================================
--- linux-2.6.24.2.orig/drivers/amba/bus.c
+++ linux-2.6.24.2/drivers/amba/bus.c
--- linux-2.6.24.7.orig/drivers/amba/bus.c
+++ linux-2.6.24.7/drivers/amba/bus.c
@@ -17,6 +17,10 @@
#include <asm/io.h>
#include <asm/sizes.h>

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/pci/Kconfig
Index: linux-2.6.24.7/drivers/pci/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/pci/Kconfig
+++ linux-2.6.24.2/drivers/pci/Kconfig
--- linux-2.6.24.7.orig/drivers/pci/Kconfig
+++ linux-2.6.24.7/drivers/pci/Kconfig
@@ -42,6 +42,12 @@ config PCI_DEBUG
When in doubt, say N.
@ -15,10 +15,10 @@ Index: linux-2.6.24.2/drivers/pci/Kconfig
config HT_IRQ
bool "Interrupts on hypertransport devices"
default y
Index: linux-2.6.24.2/drivers/pci/quirks.c
Index: linux-2.6.24.7/drivers/pci/quirks.c
===================================================================
--- linux-2.6.24.2.orig/drivers/pci/quirks.c
+++ linux-2.6.24.2/drivers/pci/quirks.c
--- linux-2.6.24.7.orig/drivers/pci/quirks.c
+++ linux-2.6.24.7/drivers/pci/quirks.c
@@ -23,6 +23,7 @@
#include <linux/acpi.h>
#include "pci.h"
@ -27,7 +27,7 @@ Index: linux-2.6.24.2/drivers/pci/quirks.c
/* The Mellanox Tavor device gives false positive parity errors
* Mark this device with a broken_parity_status, to allow
* PCI scanning code to "skip" this now blacklisted device.
@@ -1479,6 +1480,7 @@ static void __devinit fixup_rev1_53c810(
@@ -1480,6 +1481,7 @@ static void __devinit fixup_rev1_53c810(
}
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@ -35,7 +35,7 @@ Index: linux-2.6.24.2/drivers/pci/quirks.c
static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
{
@@ -1542,6 +1544,7 @@ void pci_fixup_device(enum pci_fixup_pas
@@ -1543,6 +1545,7 @@ void pci_fixup_device(enum pci_fixup_pas
}
EXPORT_SYMBOL(pci_fixup_device);
@ -43,7 +43,7 @@ Index: linux-2.6.24.2/drivers/pci/quirks.c
/* Enable 1k I/O space granularity on the Intel P64H2 */
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
{
@@ -1755,3 +1758,4 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
@@ -1756,3 +1759,4 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
quirk_msi_intx_disable_bug);
#endif /* CONFIG_PCI_MSI */

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/leds/leds-gpio.c
Index: linux-2.6.24.7/drivers/leds/leds-gpio.c
===================================================================
--- linux-2.6.24.2.orig/drivers/leds/leds-gpio.c
+++ linux-2.6.24.2/drivers/leds/leds-gpio.c
--- linux-2.6.24.7.orig/drivers/leds/leds-gpio.c
+++ linux-2.6.24.7/drivers/leds/leds-gpio.c
@@ -41,13 +41,17 @@ static void gpio_led_set(struct led_clas
container_of(led_cdev, struct gpio_led_data, cdev);
int level;

View file

@ -1,7 +1,7 @@
Index: linux-2.6.24.2/drivers/watchdog/Kconfig
Index: linux-2.6.24.7/drivers/watchdog/Kconfig
===================================================================
--- linux-2.6.24.2.orig/drivers/watchdog/Kconfig
+++ linux-2.6.24.2/drivers/watchdog/Kconfig
--- linux-2.6.24.7.orig/drivers/watchdog/Kconfig
+++ linux-2.6.24.7/drivers/watchdog/Kconfig
@@ -607,6 +607,18 @@ config SBC_EPX_C3_WATCHDOG
# MIPS Architecture
@ -21,10 +21,10 @@ Index: linux-2.6.24.2/drivers/watchdog/Kconfig
config INDYDOG
tristate "Indy/I2 Hardware Watchdog"
depends on SGI_IP22
Index: linux-2.6.24.2/drivers/watchdog/Makefile
Index: linux-2.6.24.7/drivers/watchdog/Makefile
===================================================================
--- linux-2.6.24.2.orig/drivers/watchdog/Makefile
+++ linux-2.6.24.2/drivers/watchdog/Makefile
--- linux-2.6.24.7.orig/drivers/watchdog/Makefile
+++ linux-2.6.24.7/drivers/watchdog/Makefile
@@ -89,6 +89,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
# M68KNOMMU Architecture