diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
| commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
| tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /drivers/usb | |
| parent | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (diff) | |
| parent | 1d1f8b377c48e5aeddaea52eba74cc0539f088cd (diff) | |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/mon/mon_text.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c index 5e3e4e9b6c77..1f715436d6d3 100644 --- a/drivers/usb/mon/mon_text.c +++ b/drivers/usb/mon/mon_text.c | |||
| @@ -87,7 +87,7 @@ struct mon_reader_text { | |||
| 87 | 87 | ||
| 88 | static struct dentry *mon_dir; /* Usually /sys/kernel/debug/usbmon */ | 88 | static struct dentry *mon_dir; /* Usually /sys/kernel/debug/usbmon */ |
| 89 | 89 | ||
| 90 | static void mon_text_ctor(struct kmem_cache *, void *); | 90 | static void mon_text_ctor(void *); |
| 91 | 91 | ||
| 92 | struct mon_text_ptr { | 92 | struct mon_text_ptr { |
| 93 | int cnt, limit; | 93 | int cnt, limit; |
| @@ -720,7 +720,7 @@ void mon_text_del(struct mon_bus *mbus) | |||
| 720 | /* | 720 | /* |
| 721 | * Slab interface: constructor. | 721 | * Slab interface: constructor. |
| 722 | */ | 722 | */ |
| 723 | static void mon_text_ctor(struct kmem_cache *slab, void *mem) | 723 | static void mon_text_ctor(void *mem) |
| 724 | { | 724 | { |
| 725 | /* | 725 | /* |
| 726 | * Nothing to initialize. No, really! | 726 | * Nothing to initialize. No, really! |