hi,
this patch fixes compilation for sound/oss/vwsnd.o, by moving
li_destroy() above li_create()
sound/oss/vwsnd.c:275: warning: conflicting types for ‘li_destroy’
sound/oss/vwsnd.c:275: error: static declaration of ‘li_destroy’ follows non-static declaration
sound/oss/vwsnd.c:264: error: previous implicit declaration of ‘li_destroy’ was here
Signed-off-by: Eric Sesterhenn <[email protected]>
--- linux-2.6.16-git6/sound/oss/vwsnd.c 2006-03-23 22:57:54.000000000 +0100
+++ linux-2.6.16-git6.new/sound/oss/vwsnd.c 2006-03-23 22:58:30.000000000 +0100
@@ -247,6 +247,26 @@ typedef struct lithium {
} lithium_t;
/*
+ * li_destroy destroys the lithium_t structure and vm mappings.
+ */
+
+static void li_destroy(lithium_t *lith)
+{
+ if (lith->page0) {
+ iounmap(lith->page0);
+ lith->page0 = NULL;
+ }
+ if (lith->page1) {
+ iounmap(lith->page1);
+ lith->page1 = NULL;
+ }
+ if (lith->page2) {
+ iounmap(lith->page2);
+ lith->page2 = NULL;
+ }
+}
+
+/*
* li_create initializes the lithium_t structure and sets up vm mappings
* to access the registers.
* Returns 0 on success, -errno on failure.
@@ -268,26 +288,6 @@ static int __init li_create(lithium_t *l
}
/*
- * li_destroy destroys the lithium_t structure and vm mappings.
- */
-
-static void li_destroy(lithium_t *lith)
-{
- if (lith->page0) {
- iounmap(lith->page0);
- lith->page0 = NULL;
- }
- if (lith->page1) {
- iounmap(lith->page1);
- lith->page1 = NULL;
- }
- if (lith->page2) {
- iounmap(lith->page2);
- lith->page2 = NULL;
- }
-}
-
-/*
* basic register accessors - read/write long/byte
*/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
