From: Alan Cox <alan@redhat.com>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 10/19] ibmtr: PCMCIA IBMTR is ok on 64bit
Date: Sun, 05 Oct 2008 17:37:17 +0100 [thread overview]
Message-ID: <20081005163708.3799.64928.stgit@localhost.localdomain> (raw)
In-Reply-To: <20081005163302.3799.61899.stgit@localhost.localdomain>
For whatever value of 'OK' can be applied to the use of token ring. Seems
the 32bit to 64bit cleanups missed re-enabling the pcmcia driver
Closes #7133 and also reviewed the code in question
Signed-off-by: Alan Cox <alan@redhat.com>
---
drivers/mtd/chips/map_rom.c | 5 +++--
drivers/net/pcmcia/Kconfig | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/chips/map_rom.c b/drivers/mtd/chips/map_rom.c
index c11f398..8fb3280 100644
--- a/drivers/mtd/chips/map_rom.c
+++ b/drivers/mtd/chips/map_rom.c
@@ -19,7 +19,7 @@ static int maprom_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
static int maprom_write (struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
static void maprom_nop (struct mtd_info *);
static struct mtd_info *map_rom_probe(struct map_info *map);
-static void maprom_erase (struct mtd_info *mtd, struct erase_info *info);
+static int maprom_erase (struct mtd_info *mtd, struct erase_info *info);
static struct mtd_chip_driver maprom_chipdrv = {
.probe = map_rom_probe,
@@ -73,9 +73,10 @@ static int maprom_write (struct mtd_info *mtd, loff_t to, size_t len, size_t *re
return -EIO;
}
-static void maprom_erase (struct mtd_info *mtd, struct erase_info *info)
+static int maprom_erase (struct mtd_info *mtd, struct erase_info *info)
{
/* We do our best 8) */
+ return -EIO;
}
static int __init map_rom_init(void)
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index e8f55d8..9b8f793 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -111,7 +111,7 @@ config ARCNET_COM20020_CS
config PCMCIA_IBMTR
tristate "IBM PCMCIA tokenring adapter support"
- depends on IBMTR!=y && TR && !64BIT
+ depends on IBMTR!=y && TR
help
Say Y here if you intend to attach this type of Token Ring PCMCIA
card to your computer. You then also need to say Y to "Token Ring
next prev parent reply other threads:[~2008-10-05 16:40 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-05 16:34 [PATCH 00/19] Alan's Miscellaneous Tree Alan Cox
2008-10-05 16:35 ` [PATCH 01/19] pcmcia: Fix wireless drivers Alan Cox
2008-10-05 16:35 ` [PATCH 02/19] pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted Alan Cox
2008-10-05 16:40 ` Marcel Holtmann
2008-10-17 21:17 ` Dominik Brodowski
2008-10-05 16:35 ` [PATCH 03/19] pcmcia: Whine harder about use of EXCLUSIVE Alan Cox
2008-10-17 21:17 ` Dominik Brodowski
2008-10-05 16:36 ` [PATCH 04/19] ib700wdt: Fix off by one Alan Cox
2008-10-05 16:36 ` [PATCH 05/19] aic7xxx: MHz not Mhz for SI unit pedants Alan Cox
2008-10-05 16:36 ` [PATCH 06/19] hfsplus: O_LARGEFILE checking is missing Alan Cox
2008-10-05 16:36 ` [PATCH 07/19] mtd: intel_dc21285 switch to ROM API Alan Cox
2008-10-05 16:36 ` [PATCH 08/19] qla2xxx: Switch " Alan Cox
2008-10-05 16:37 ` [PATCH 09/19] mtd: map_rom has NULL erase pointer Alan Cox
2008-10-05 16:37 ` Alan Cox [this message]
2008-10-05 16:37 ` [PATCH 11/19] mptlan: Kill unused NAA workaround code Alan Cox
2008-10-05 16:37 ` [PATCH 12/19] pxa27x_udc: leak fix Alan Cox
2008-10-05 16:37 ` [PATCH 13/19] serial_8250: pci_enable_device fail is not fully handled Alan Cox
2008-10-05 16:38 ` [PATCH 14/19] parport: quickfix the proc registration bug Alan Cox
2008-10-05 18:10 ` Frans Pop
2008-10-05 18:22 ` Alan Cox
2008-10-05 16:38 ` [PATCH 15/19] email: sort out a consistent email address for contributions and stuff Alan Cox
2008-10-05 16:38 ` [PATCH 16/19] mptsas: remove unneeded check Alan Cox
2008-10-05 16:38 ` [PATCH 17/19] cdc-acm: Add another conexant modem to the quirks Alan Cox
2008-10-05 16:39 ` [PATCH 18/19] modinfo: Remove duplicate modinfo from some drivers Alan Cox
2008-10-06 8:54 ` Adrian Bunk
2008-10-05 16:39 ` [PATCH 19/19] fdomain_cs: Sort out modules with duplicate description Alan Cox
2008-10-17 21:18 ` Dominik Brodowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081005163708.3799.64928.stgit@localhost.localdomain \
--to=alan@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox