diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-29 01:05:50 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-29 01:05:50 +0300 |
| commit | b0d44c0dbbd52effb731b1c0af9afd56215c48de (patch) | |
| tree | 3237c0087d91a5390aed05689b9f610ba16fa116 /drivers/isdn/hardware/mISDN/hfcsusb.c | |
| parent | 9537a48ed4b9e4b738943d6da0a0fd4278adf905 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
| download | linux-b0d44c0dbbd52effb731b1c0af9afd56215c48de.tar.xz | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'drivers/isdn/hardware/mISDN/hfcsusb.c')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/hfcsusb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c index ba6925fbf38a..9c427fb204ee 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.c +++ b/drivers/isdn/hardware/mISDN/hfcsusb.c @@ -35,7 +35,7 @@ #include <linux/mISDNhw.h> #include "hfcsusb.h" -const char *hfcsusb_rev = "Revision: 0.3.3 (socket), 2008-11-05"; +static const char *hfcsusb_rev = "Revision: 0.3.3 (socket), 2008-11-05"; static unsigned int debug; static int poll = DEFAULT_TRANSP_BURST_SZ; @@ -974,7 +974,7 @@ hfcsusb_rx_frame(struct usb_fifo *fifo, __u8 *data, unsigned int len, spin_unlock(&hw->lock); } -void +static void fill_isoc_urb(struct urb *urb, struct usb_device *dev, unsigned int pipe, void *buf, int num_packets, int packet_size, int interval, usb_complete_t complete, void *context) @@ -1720,7 +1720,7 @@ hfcsusb_stop_endpoint(struct hfcsusb *hw, int channel) /* Hardware Initialization */ -int +static int setup_hfcsusb(struct hfcsusb *hw) { int err; |