[linuxsh-dev] A couple of minor fixes

[Jesper S. <js...@re...>]

2000-09-28  Jesper Skov  <js...@re...>

	* arch/sh/kernel/time.c: The loop align seemed to have gone
          AWOL in the last merge.
	* drivers/pcmcia/cs.c: Missing rename.


Index: arch/sh/kernel/time.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/time.c,v
retrieving revision 1.17
diff -u -5 -r1.17 time.c
--- arch/sh/kernel/time.c	2000/10/27 01:14:20	1.17
+++ arch/sh/kernel/time.c	2000/10/27 11:28:50
@@ -335,10 +335,11 @@
 
 	sti();
 	do {} while (ctrl_inb(R64CNT) != 0);
 	ctrl_outb(RCR1_CIE, RCR1); /* Enable carry interrupt */
 	asm volatile(
+		".align2\n\t"
 		"1:\t"
 		"tst	%1,%1\n\t"
 		"bt/s	1b\n\t"
 		" add	#1,%0"
 		: "=r"(count), "=z" (__dummy)


Index: drivers/pcmcia/cs.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/drivers/pcmcia/cs.c,v
retrieving revision 1.9
diff -u -5 -r1.9 cs.c
--- drivers/pcmcia/cs.c	2000/10/27 07:21:17	1.9
+++ drivers/pcmcia/cs.c	2000/10/27 11:29:01
@@ -1834,11 +1834,11 @@
     when the configuration is locked.  Now that I think about it,
     there might be a way to fix this using a dummy handler.
     
 ======================================================================*/
 
-static int cs_request_irq(client_handle_t handle, irq_req_t *req)
+int pcmcia_request_irq(client_handle_t handle, irq_req_t *req)
 {
     socket_info_t *s;
     config_t *c;
     int ret = 0, irq = 0;
     
@@ -1900,11 +1900,11 @@
     s->irq.Config++;
     
     c->state |= CONFIG_IRQ_REQ;
     handle->state |= CLIENT_IRQ_REQ;
     return CS_SUCCESS;
-} /* cs_request_irq */
+} /* pcmcia_request_irq */
 
 /*======================================================================
 
     Request_window() establishes a mapping between card memory space
     and system memory space.