From: "Noah J. Misch" <noah@caltech.edu>

Two gameport drivers need __devexit_p wrapped around their remove
functions.  A newer binutils caught this is a link error.  This patch fixes
that.

Wrapped a __devexit_p around the 'remove' functions of two gameport
drivers.  The lack of __devexit_p was wrong according to linux/init.h,
differed from the practices in nearby files, and caused a link error with
binutils 2.14.90.0.5.

[ GregKH has already done this is USB and PCI core. ]

From: "Warren A. Layton" <zeevon@debian.org>

Based on a request from Matthew Wilcox, convert instances of
pci_dev->slot_name to use pci_name() instead:

  "In order to support PCI Domains, we have to stop using slot_name.
   It's related to driver model transition too since pci_dev->slot_name
   was redundant with pci_dev->dev.bus_id.  So I introduced the inline
   function pci_name().  Now there's about 300-400 places in the tree
   that're using slot_name which need to be converted to use pci_name().
   once that's done, we can remove the slot_name pointer in pci_dev and
   save a (void *) per pci_dev."

Fixes up drivers/input/* drivers/isdn/* drivers/media/*
drivers/mtd/* drivers/parisc/* drivers/pci/* drivers/parport/*
drivers/scsi/* and drivers/serial/*

Fix cli() breakage in input (gameport) drivers.

struct by a single struct to simplify passing it around and to
userspace.