diff options
| -rw-r--r-- | driver/warn-when-statically-allocated-kobjects-are-used.patch | 2 | ||||
| -rw-r--r-- | pci/pci-kconfig-help-don-t-refer-to-the-pci-howto.patch | 21 | ||||
| -rw-r--r-- | pci/pci_bridge-device.patch | 8 | ||||
| -rw-r--r-- | pending/pci-make-pci-extended-config-space-a-driver-opt-in.patch (renamed from pci/pci-make-pci-extended-config-space-a-driver-opt-in.patch) | 0 | ||||
| -rw-r--r-- | series | 7 | ||||
| -rw-r--r-- | version | 2 |
6 files changed, 10 insertions, 30 deletions
diff --git a/driver/warn-when-statically-allocated-kobjects-are-used.patch b/driver/warn-when-statically-allocated-kobjects-are-used.patch index 34a7e5a3d26ab1..14f39cfc317d51 100644 --- a/driver/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver/warn-when-statically-allocated-kobjects-are-used.patch @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/include/linux/init.h +++ b/include/linux/init.h -@@ -86,6 +86,7 @@ extern initcall_t __security_initcall_st +@@ -142,6 +142,7 @@ extern initcall_t __security_initcall_st extern char __initdata boot_command_line[]; extern char *saved_command_line; extern unsigned int reset_devices; diff --git a/pci/pci-kconfig-help-don-t-refer-to-the-pci-howto.patch b/pci/pci-kconfig-help-don-t-refer-to-the-pci-howto.patch index 8fe9d7ff340d80..d16132fb557cb6 100644 --- a/pci/pci-kconfig-help-don-t-refer-to-the-pci-howto.patch +++ b/pci/pci-kconfig-help-don-t-refer-to-the-pci-howto.patch @@ -23,11 +23,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> arch/m68k/Kconfig | 5 ----- arch/mips/Kconfig | 5 ----- arch/sh/drivers/pci/Kconfig | 5 ----- - arch/sh64/Kconfig | 5 ----- arch/sparc64/Kconfig | 5 ----- arch/x86/Kconfig | 5 ----- arch/xtensa/Kconfig | 5 ----- - 11 files changed, 55 deletions(-) + 10 files changed, 50 deletions(-) --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -45,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> default y --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -544,11 +544,6 @@ config PCI +@@ -572,11 +572,6 @@ config PCI your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or VESA. If you have PCI, say Y, otherwise N. @@ -101,7 +100,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> depends on !MMU_SUN3 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1920,11 +1920,6 @@ config PCI +@@ -1956,11 +1956,6 @@ config PCI your box. Other bus systems are ISA, EISA, or VESA. If you have PCI, say Y, otherwise N. @@ -127,20 +126,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> config SH_PCIDMA_NONCOHERENT bool "Cache and PCI noncoherent" depends on PCI ---- a/arch/sh64/Kconfig -+++ b/arch/sh64/Kconfig -@@ -247,11 +247,6 @@ config PCI - your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or - VESA. If you have PCI, say Y, otherwise N. - -- The PCI-HOWTO, available from -- <http://www.tldp.org/docs.html#howto>, contains valuable -- information about which PCI hardware does work under Linux and which -- doesn't. -- - config SH_PCIDMA_NONCOHERENT - bool "Cache and PCI noncoherent" - depends on PCI --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -343,11 +343,6 @@ config PCI diff --git a/pci/pci_bridge-device.patch b/pci/pci_bridge-device.patch index 804b144941ac48..7b3b948a469260 100644 --- a/pci/pci_bridge-device.patch +++ b/pci/pci_bridge-device.patch @@ -60,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c -@@ -391,7 +391,7 @@ pci_read_legacy_io(struct kobject *kobj, +@@ -359,7 +359,7 @@ pci_read_legacy_io(struct kobject *kobj, char *buf, loff_t off, size_t count) { struct pci_bus *bus = to_pci_bus(container_of(kobj, @@ -69,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> kobj)); /* Only support 1, 2 or 4 byte accesses */ -@@ -416,7 +416,7 @@ pci_write_legacy_io(struct kobject *kobj +@@ -384,7 +384,7 @@ pci_write_legacy_io(struct kobject *kobj char *buf, loff_t off, size_t count) { struct pci_bus *bus = to_pci_bus(container_of(kobj, @@ -78,7 +78,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> kobj)); /* Only support 1, 2 or 4 byte accesses */ if (count != 1 && count != 2 && count != 4) -@@ -440,7 +440,7 @@ pci_mmap_legacy_mem(struct kobject *kobj +@@ -408,7 +408,7 @@ pci_mmap_legacy_mem(struct kobject *kobj struct vm_area_struct *vma) { struct pci_bus *bus = to_pci_bus(container_of(kobj, @@ -271,7 +271,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -287,13 +287,13 @@ struct pci_bus { +@@ -278,13 +278,13 @@ struct pci_bus { unsigned short bridge_ctl; /* manage NO_ISA/FBB/et al behaviors */ pci_bus_flags_t bus_flags; /* Inherited by child busses */ struct device *bridge; diff --git a/pci/pci-make-pci-extended-config-space-a-driver-opt-in.patch b/pending/pci-make-pci-extended-config-space-a-driver-opt-in.patch index 0eedb1f4fbf244..0eedb1f4fbf244 100644 --- a/pci/pci-make-pci-extended-config-space-a-driver-opt-in.patch +++ b/pending/pci-make-pci-extended-config-space-a-driver-opt-in.patch @@ -9,7 +9,6 @@ gregkh/gcc43-workaround.diff # driver patches queued for 2.6.24 driver/driver-core-fix-up-build-when-config_block-n.patch driver/x86-fix-runtime-error-in-arch-x86-kernel-cpu-mcheck-mce_amd_64.c.patch -driver/module-check-to-see-if-we-have-a-built-in-module-with-the-same-name.patch driver/driver-core-add-bus_find_device_by_name-function.patch driver/net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch driver/ppc-fix-powerpc-vio_find_name-to-not-use-devices_subsys.patch @@ -20,7 +19,6 @@ driver/driver-core-convert-to-use-class_find_device-api.patch driver/kobject-kerneldoc-comment-fix.patch # driver patches for after 2.6.24 is out -#driver/atm-convert-struct-class_device-to-struct-device.patch # helper tools, not for mainline. driver/put_device-might_sleep.patch @@ -96,7 +94,6 @@ pci/pci-pcie-aspm-support.patch # people love to argue... -pci/pci-make-pci-extended-config-space-a-driver-opt-in.patch # akpm reports that this breaks his x86 box, wait until that is sorted out before sending to Linus pci/pci_bridge-device.patch @@ -121,6 +118,7 @@ usb/usb-use-gfp_noio-in-reset-path.patch usb/usb-variant-of-the-dell-wireless-5520-driver.patch usb/usb-storage-add-unusual_dev-for-hp-r707.patch usb/usb-fix-usbtest-halt-check-on-big-endian-systems.patch +usb/usb-handle-idvendor-of-0x0000.patch # usb stuff for after 2.6.24 is out usb/usb-convert-from-class_device-to-device-for-usb-core.patch @@ -222,7 +220,6 @@ usb/usb-ehci-remove-false-clear-reset-path.patch usb/usb-ehci-should-use-u16-for-isochronous-intervals.patch usb/usb-fix-usb_serial_driver-structure-for-kobil-cardreader-driver.patch usb/usbfs_opts.patch -usb/usb-handle-idvendor-of-0x0000.patch usb/usb-use-a-real-vendor-and-product-id-for-root-hubs.patch usb/usb-mark-usb-drivers-as-being-gpl-only.patch @@ -237,5 +234,3 @@ usb/usb-gotemp.patch #pending/block-make-genhd-use-the-new-class-iterator-functions.patch #pending/class-move-driver-core-specific-parts-to-a-private-structure.patch - -f1.patch @@ -1 +1 @@ -2.6.24-git4 +2.6.24-git7 |