m68k patches for 2.6.24
Geert Uytterhoeven
maintainercover m68k patches for 2.6.24
Hi Linus, Andrew,
Here are 3 m68k patches for 2.6.24:
[1] m68k: export atari_keyb_init
[2] Amiga zorro bus: Add missing zorro_device_remove()
[3] mac68k: mailing list addresss
Please apply. Thx!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Geert Uytterhoeven
maintainerPATCH 1/3 m68k: export atari_keyb_init
From: Adrian Bunk <[email protected]>
m68k: export atari_keyb_init
This patch fixes the following build error:
<-- snip -->
..
MODPOST 25 modules
ERROR: "atari_keyb_init" [drivers/input/mouse/atarimouse.ko] undefined!
ERROR: "atari_keyb_init" [drivers/input/keyboard/atakbd.ko] undefined! make[2]: *** [__modpost] Error 1
<-- snip -->
--- arch/m68k/atari/atakeyb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/m68k/atari/atakeyb.c +2 -1
@@ -565,7 +565,7 @@ void atari_kbd_leds(unsigned int leds)static int atari_keyb_done =0 ; -int __init atari_keyb_init (void ) +int atari_keyb_init (void ) {if (atari_keyb_done)return 0 ;
@@ -631,6 +631,7 @@ int __init atari_keyb_init(void) atari_keyb_done =1 ;return 0 ; } +EXPORT_SYMBOL_GPL (atari_keyb_init);int atari_kbd_translate (unsigned char keycode,unsigned char *keycodep,char raw_mode) {
Signature · 10 lines
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsGeert Uytterhoeven
maintainerPATCH 2/3 Amiga zorro bus: Add missing zorro_device_remove()
In reply to Geert UytterhoevenFrom: Geert Uytterhoeven <[email protected]>
Amiga zorro bus: Add missing zorro_device_remove(). Without this ifconfig and /proc/net/dev oops after unloading a Zorro network device driver module.
--- drivers/zorro/zorro-driver.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/zorro/zorro-driver.c +15 -0
@@ -60,6 +60,20 @@ static int zorro_device_probe(struct dev } +static int zorro_device_remove (struct device *dev) +{ +struct zorro_dev *z =to_zorro_dev (dev); +struct zorro_driver *drv =to_zorro_driver (dev->driver); + +if (drv) { +if (drv->remove) + drv->remove (z); + z->driver =NULL ; + } +return 0 ; +} + +/** * zorro_register_driver - register a new Zorro driver * @drv: the driver structure to register
@@ -128,6 +142,7 @@ struct bus_type zorro_bus_type = { .name = "zorro", .match = zorro_bus_match, .probe = zorro_device_probe, + .remove = zorro_device_remove, };
Signature · 10 lines
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsGeert Uytterhoeven
maintainerPATCH 3/3 mac68k: mailing list addresss
In reply to Geert UytterhoevenFrom: Finn Thain <[email protected]>
The mail service for the mac.linux-m68k.org domain is defunct.
--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
@@ -2446,7 +2446,7 @@ M68K ON APPLE MACINTOSH P: Joshua Thompson M: [email protected] W: http://www.mac.linux-m68k.org/ -L: [email protected] +L: [email protected] S: Maintained M68K ON HP9000/300
Signature · 10 lines
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds