diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-11 14:21:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-11 14:21:23 +0100 |
| commit | 3d7a8278fdfdea5be4c647853171a0df5d13c1d3 (patch) | |
| tree | b80b6f13899a06e88cd379f60bff1940e7bb9323 /drivers/pcmcia/Makefile | |
| parent | Revert "pcmcia: fix incorrect bracketing on a test" (diff) | |
| download | linux-3d7a8278fdfdea5be4c647853171a0df5d13c1d3.tar.xz linux-3d7a8278fdfdea5be4c647853171a0df5d13c1d3.zip | |
Revert "pcmcia: add a new resource manager for non ISA systems"
This reverts commit 02b03846bb2befc558bfd0665749d6bb26f4c2f1.
Alan writes:
it seems there is a regression in there for some configuration of I/O
based devices. I'll take a look at it over the next couple of kernel
releases and see what is up then resubmit it with fixes.
Reported-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pcmcia/Makefile')
| -rw-r--r-- | drivers/pcmcia/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index f1a7ca04d89e..27e94b30cf96 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -12,7 +12,6 @@ obj-$(CONFIG_PCMCIA) += pcmcia.o pcmcia_rsrc-y += rsrc_mgr.o pcmcia_rsrc-$(CONFIG_PCCARD_NONSTATIC) += rsrc_nonstatic.o pcmcia_rsrc-$(CONFIG_PCCARD_IODYN) += rsrc_iodyn.o -pcmcia_rsrc-$(CONFIG_PCCARD_PCI) += rsrc_pci.o obj-$(CONFIG_PCCARD) += pcmcia_rsrc.o |