Commits · 717abc98fe8ba4fcb2c02eb1609c6a68fe7d9c4f · nexedi / linux

13 Nov, 2004 5 commits

Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 · 717abc98
Linus Torvalds authored Nov 12, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
717abc98
Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6 · da050bdb
Linus Torvalds authored Nov 12, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
da050bdb
Merge bk://kernel.bkbits.net/gregkh/linux/driver-2.6 · 9e0ce90e
Linus Torvalds authored Nov 12, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
9e0ce90e
Merge bk://kernel.bkbits.net/davem/net-2.6 · aa5743cc
Linus Torvalds authored Nov 12, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
aa5743cc

[PATCH] EDD: fix too short array · e45d5579

Matt Domsch authored Nov 12, 2004

Bingo...  edd_devices[] was too short.  When we keep more than 6
signatures, it overruns the end.  Also, I rewrote edd_num_devices to be
clearer about its goal. 

This patch is necessary even after the last edd.S patch was reverted.

Thanks to Christian Kujau for testing and narrowing it down enough to
debug this. 

It still doesn't explain why Christian's BIOS reports more devices than
he has, that's still up in the air, so don't re-apply the edd.S patch
just reverted. 
Signed-off-by: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

e45d5579

12 Nov, 2004 1 commit
- Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk · e9398715
  Linus Torvalds authored Nov 12, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
  e9398715
13 Nov, 2004 6 commits
- [MTD] sa1100: Obtain flash device location from platform device. · ecb5548d
  Russell King authored Nov 13, 2004
```
Remove static flash device location definitions since they're now
obsolete.  Additionally, dynamically allocate driver private data
structures.
```
  ecb5548d
- [MTD] sa1100: Use set_vpp functions provided by machine support code. · 1b4e119d
  Russell King authored Nov 13, 2004
  
  1b4e119d
- [MTD] sa1100: remove static partitioning information. · 2123e979
  Russell King authored Nov 13, 2004
```
Use partitioning information passed in via the platform device
instead.  This means that individual machine files in
arch/arm/mach-sa1100 can contain their partitioning information.
```
  2123e979
- [MTD] sa1100: more driver model integration and consolidation. · 6748bfdd
  Russell King authored Nov 13, 2004
```
- combine sa1100_locate_partitions with sa1100_mtd_probe.
- set device driver data in the probe method, and use this to get
  at our driver private information in the other methods.
```
  6748bfdd
- [MTD] sa1100: add container structure for one logical flash device. · f3033b3c
  Russell King authored Nov 13, 2004
  
  f3033b3c
- [MTD] sa1100: consolidate mtd and partition destructors. · 07ca9d40
  Russell King authored Nov 13, 2004
  
  07ca9d40
12 Nov, 2004 28 commits

[MTD] sa1100: split out sub-device init/destruction. · c26c68e3
Russell King authored Nov 12, 2004

c26c68e3
[MTD] sa1100: add driver model support and remove static flash probing · 310f172b
Russell King authored Nov 12, 2004
```
This prepares the SA1100 flash driver to accept platform data via
the driver model.
```
310f172b

[ARM] Remove broken SA1100 machine support. · 5eb89b1b

Russell King authored Nov 12, 2004

This removes a bunch of SA1100 machine support files which have been
unable to be built for a while, due to missing out on updates.

Warning of removal had been posted to the ARM kernel mailing list,
and this cset represents those which did not attract any interest.

5eb89b1b

[ARM] Add platform_device-based partition and map information. · a6afe87f

Russell King authored Nov 12, 2004

This adds platform_device-based partition and map information for
badge4, cerf, collie, h3600, hackkit and shannon SA1100 machine
types.

a6afe87f

[ARM] Remove unused 'mclk' element from MMC platform structure. · 85a94fa8
Russell King authored Nov 12, 2004

85a94fa8
[ARM] Fix IMX build error post sys_timer merge. · 67553751
Russell King authored Nov 12, 2004

67553751

[ARM PATCH] 2232/2: S3C2410 - RTC driver · 6a8a8108

Ben Dooks authored Nov 12, 2004

Patch from Ben Dooks

S3C2410/S3C2440 RTC driver using arch/arm/common/rtctime.c as
a base. Supports alarm, and periodic IRQ from 1 to 64Hz

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

6a8a8108

[ARM PATCH] 2231/1: remove unused file in iop321 port · fd8ae422

Dave Jiang authored Nov 12, 2004

Patch from Dave Jiang

Remove nolonger used file from arch/arm/mach-iop3xx/mm-321.c

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

fd8ae422

Merge kroah.com:/home/greg/linux/BK/bleed-2.6 · 8f0f592d
Greg Kroah-Hartman authored Nov 11, 2004
```
into kroah.com:/home/greg/linux/BK/pci-2.6
```
8f0f592d
Merge kroah.com:/home/greg/linux/BK/bleed-2.6 · 9b4b2fa2
Greg Kroah-Hartman authored Nov 11, 2004
```
into kroah.com:/home/greg/linux/BK/usb-2.6
```
9b4b2fa2

USB: fix up a bunch of sparse bitwise warnings in the ohci driver · 26b1295f

Greg Kroah-Hartman authored Nov 11, 2004

This all because of stupid hardware implementations that can't decide
which endian form they want to run the chip in...
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

26b1295f

USB: fix sparse warnings in io_ti.c · 425d94d0
Greg Kroah-Hartman authored Nov 11, 2004
```
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
```
425d94d0
[PATCH] prep_pci.c: replace pci_find_device with pci_get_device · 27ab3d70
Hanna V. Linder authored Nov 11, 2004
```
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
```
27ab3d70
[PATCH] pplus.c: replace pci_find_device with pci_get_device · 97b8b774
Hanna V. Linder authored Nov 11, 2004
```
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
```
97b8b774

[PATCH] pmac_pci.c: replace pci_find_device with pci_get_device · b36d9bf7

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>

b36d9bf7

[PATCH] pcore.c: replace pci_find_device with pci_get_device · c1fdbf7c

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device
and pci_dev_put.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

c1fdbf7c

[PATCH] mcpn765.c: replace pci_find_device with pci_get_device · c1d746dd

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device
and pci_dev_put.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

c1d746dd

[PATCH] prpmc750.c: replace pci_find_device with pci_get_device · 44be43c6

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

44be43c6

[PATCH] sandpoint.c: replace pci_find_device with pci_get_device · c2826904

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

c2826904

[PATCH] fixups-dreamcast.c: replace pci_find_device with pci_get_device · 11f5630a

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device
and pci_dev_put.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

11f5630a

[PATCH] ebus.c: replace pci_find_device with pci_get_device · 581484d2
Hanna V. Linder authored Nov 11, 2004
```
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
```
581484d2

[PATCH] isa.c: replace pci_find_device with pci_get_device · 991c07fd

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

991c07fd

[PATCH] pci_iommu.c: replace pci_find_device with pci_get_device · 7338a0a7

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

7338a0a7

[PATCH] ret_mb_a_pci.c: replace pci_find_device with pci_get_device · d719a896

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

d719a896

[PATCH] pci-gart.c: replace pci_find_device with pci_get_device · 6e90ef05

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

6e90ef05

[PATCH] sis-agp.c: replace pci_find_device with pci_get_device · 562c0074

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away soon I have converted this file to use
pci_get_device instead. for_each_pci_dev is a macro wrapper around
pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

562c0074

[PATCH] drm_drv.h: replace pci_find_device · 6be9f519

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
for_each_pci_dev is a macro wrapper around pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

6be9f519

[PATCH] cmipci.c: convert pci_find_device to pci_get_device · 71ecb262

Hanna V. Linder authored Nov 11, 2004

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

71ecb262