[GIT PULL] char/misc driver fixes for 4.0-rc5

From: Greg KH
Date: Sun Mar 22 2015 - 06:38:24 EST


The following changes since commit 9eccca0843205f87c00404b663188b88eb248051:

Linux 4.0-rc3 (2015-03-08 16:09:09 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/ tags/char-misc-4.0-rc5

for you to fetch changes up to 3d7a8278fdfdea5be4c647853171a0df5d13c1d3:

Revert "pcmcia: add a new resource manager for non ISA systems" (2015-03-11 14:21:23 +0100)

----------------------------------------------------------------
Char/MISC fixes for 4.0-rc5

Here are three fixes for 4.0-rc5 that revert 3 PCMCIA patches that were
merged in 4.0-rc1 that cause regressions. So let's revert them for now
and they will be reworked and resent sometime in the future.

All have been tested in linux-next for a while.

Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

----------------------------------------------------------------
Greg Kroah-Hartman (3):
Revert "pcmcia: add missing include for new pci resource handler"
Revert "pcmcia: fix incorrect bracketing on a test"
Revert "pcmcia: add a new resource manager for non ISA systems"

drivers/pcmcia/Kconfig | 12 +---
drivers/pcmcia/Makefile | 1 -
drivers/pcmcia/rsrc_pci.c | 173 ----------------------------------------------
3 files changed, 3 insertions(+), 183 deletions(-)
delete mode 100644 drivers/pcmcia/rsrc_pci.c
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/