| 
      
      
      From: Paul M. <le...@us...> - 2006-08-03 03:58:31
      
     | 
| Update of /cvsroot/linuxsh/linux/arch/sh/boards/shmin In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3741/arch/sh/boards/shmin Modified Files: Makefile setup.c Log Message: Lindent shmin, some few other minor cleanups. Kill accidental Makefile duplication. Index: Makefile =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/boards/shmin/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 2 Aug 2006 15:02:20 -0000 1.1 +++ Makefile 3 Aug 2006 03:58:27 -0000 1.2 @@ -3,8 +3,3 @@ # obj-y := setup.o -# -# Makefile for the SHMIN board. -# - -obj-y := setup.o Index: setup.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/boards/shmin/setup.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- setup.c 2 Aug 2006 15:02:20 -0000 1.1 +++ setup.c 3 Aug 2006 03:58:27 -0000 1.2 @@ -19,7 +19,7 @@ return "SHMIN"; } -void __init init_shmin_irq(void) +static void __init init_shmin_irq(void) { ctrl_outw(0x2a00, PFC_PHCR); // IRQ0-3=IRQ ctrl_outw(0x0aaa, INTC_ICR1); // IRQ0-3=IRQ-mode,Low-active. @@ -29,12 +29,15 @@ { } -void __iomem *shmin_ioport_map(unsigned long port, unsigned int size) +static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size) { static int dummy; - if((port&~0x1f)==SHMIN_NE_BASE) - return (void __iomem*)(SHMIN_IO_BASE+port); - dummy=0; + + if ((port & ~0x1f) == SHMIN_NE_BASE) + return (void __iomem *)(SHMIN_IO_BASE + port); + + dummy = 0; + return &dummy; } |