Update of /cvsroot/gc-linux/linux/arch/powerpc/include/asm
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17186/arch/powerpc/include/asm
Modified Files:
starlet.h udbg.h
Log Message:
Merge 2.6.28.
Also:
- run checkpatch against the non-broken source code
- add GPIO driver fixes
- implement getgeo for the special block drivers
- small fixes
Index: starlet.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/starlet.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- starlet.h 11 Jan 2009 20:07:04 -0000 1.1
+++ starlet.h 1 Feb 2009 18:29:34 -0000 1.2
@@ -2,8 +2,8 @@
* arch/powerpc/include/asm/starlet.h
*
* Nintendo Wii starlet processor definitions
- * Copyright (C) 2008 The GameCube Linux Team
- * Copyright (C) 2008 Albert Herranz
+ * Copyright (C) 2008-2009 The GameCube Linux Team
+ * Copyright (C) 2008,2009 Albert Herranz
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -187,10 +187,10 @@
extern int starlet_close(int fd);
extern int starlet_ioctl(int fd, int request,
- void *ibuf, size_t ilen,
+ void *ibuf, size_t ilen,
void *obuf, size_t olen);
extern int starlet_ioctl_nowait(int fd, int request,
- void *ibuf, size_t ilen,
+ void *ibuf, size_t ilen,
void *obuf, size_t olen,
starlet_ipc_callback_t callback,
void *arg);
Index: udbg.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/udbg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- udbg.h 11 Jan 2009 20:07:04 -0000 1.1
+++ udbg.h 1 Feb 2009 18:29:34 -0000 1.2
@@ -50,7 +50,7 @@
extern void __init udbg_init_44x_as1(void);
extern void __init udbg_init_40x_realmode(void);
extern void __init udbg_init_cpm(void);
-extern void __init udbg_init_debug_usbgecko(void);
+extern void __init udbg_init_usbgecko(void);
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_UDBG_H */
|
