lkml.org 
[lkml]   [2008]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 10/19] ibmtr: PCMCIA IBMTR is ok on 64bit
Date
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


\
 
 \ /
  Last update: 2008-10-05 18:43    [W:0.099 / U:27.368 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site