diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-29 01:34:14 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-29 01:34:14 +0300 |
| commit | 38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch) | |
| tree | a83d5e4e86edf6cb2de22db6f2ff2274753a2bab /drivers/isdn/hardware/mISDN/hfcsusb.h | |
| parent | f2d28a2ebcb525a6ec7e2152106ddb385ef52b73 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
| download | linux-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.tar.xz | |
Merge branch 'linus' into core/printk
Diffstat (limited to 'drivers/isdn/hardware/mISDN/hfcsusb.h')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/hfcsusb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.h b/drivers/isdn/hardware/mISDN/hfcsusb.h index 098486b8e8d2..43efe7358fa3 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.h +++ b/drivers/isdn/hardware/mISDN/hfcsusb.h @@ -198,7 +198,7 @@ validconf[][19] = { }; /* string description of chosen config */ -char *conf_str[] = { +static char *conf_str[] = { "4 Interrupt IN + 3 Isochron OUT", "3 Interrupt IN + 3 Isochron OUT", "4 Isochron IN + 3 Isochron OUT", @@ -316,7 +316,7 @@ struct hfcsusb_vdata { #define HFC_MAX_TE_LAYER1_STATE 8 #define HFC_MAX_NT_LAYER1_STATE 4 -const char *HFC_TE_LAYER1_STATES[HFC_MAX_TE_LAYER1_STATE + 1] = { +static const char *HFC_TE_LAYER1_STATES[HFC_MAX_TE_LAYER1_STATE + 1] = { "TE F0 - Reset", "TE F1 - Reset", "TE F2 - Sensing", @@ -328,7 +328,7 @@ const char *HFC_TE_LAYER1_STATES[HFC_MAX_TE_LAYER1_STATE + 1] = { "TE F8 - Lost framing", }; -const char *HFC_NT_LAYER1_STATES[HFC_MAX_NT_LAYER1_STATE + 1] = { +static const char *HFC_NT_LAYER1_STATES[HFC_MAX_NT_LAYER1_STATE + 1] = { "NT G0 - Reset", "NT G1 - Deactive", "NT G2 - Pending activation", |