Merge remote-tracking branches 'asoc/topic/uda1380', 'asoc/topic/unregister', 'asoc...

[sfrench/cifs-2.6.git] / sound / oss / dev_table.h

diff --git a/sound/oss/dev_table.h b/sound/oss/dev_table.h
index b7617bee6388f13be8fa4bf842c6c88990faef90..0199a317c5a9a5d2d180ad9f5ab03a6b048a0066 100644 (file)
--- a/sound/oss/dev_table.h
+++ b/sound/oss/dev_table.h
@@ -271,7 +271,7 @@ struct synth_operations
        void (*reset) (int dev);
        void (*hw_control) (int dev, unsigned char *event);
        int (*load_patch) (int dev, int format, const char __user *addr,
-            int offs, int count, int pmgr_flag);
+            int count, int pmgr_flag);
        void (*aftertouch) (int dev, int voice, int pressure);
        void (*controller) (int dev, int voice, int ctrl_num, int value);
        void (*panning) (int dev, int voice, int value);