And remember to decrement the count after remove() is called.

  
This will let include/linux/pci.h get smaller, and is what I should 
have done in the first place 2 years ago...

No one is using them outside the pci core.

[PATCH] PCI: make pci_setup_device(), pci_alloc_primary_bus() and pci_alloc_primary_bus_parented() static

No one is calling these functions.

into kroah.com:/home/greg/linux/BK/pci-2.5

Linker script updates for m68knommu architecture:

 - fix _ramend for DragonEngine2 board
 - add  security init call support

Clean up the dodgy is_in_rom() code for m68knommu targets.

Now that all the m68knommu sub-architectures (68x328, 68360
and ColdFire) have the same memory setup support we can
make this code the same for all targets.

Change the m68knommu specific calls to do_fork() to match
its pid return vlue.

 - Unrevert strncpy->strlcpy change in JEDEC chip driver
 - Fix partition handling in physmap map driver
 - Switch sa1100-flash map driver back to rmk's version.

into infradead.org:/inst/bk/linus-2.5

sys_wait4 can return a pid and in this case we want to copy the struct
rusage out to userspace.