diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 11:05:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 11:05:27 -0700 |
| commit | a0a4d17e02a80a74a63c7cbb7bc8cea2f0b7d8b1 (patch) | |
| tree | 5ec6988f3661ced8eab05f5ec618e7be689372bc /include | |
| parent | 86c67ce20d080bdfefafd461d3068cad0a49a66b (diff) | |
| parent | 46d0797906633d82bd50ef26780ee39fac5d27d6 (diff) | |
| download | linux-a0a4d17e02a80a74a63c7cbb7bc8cea2f0b7d8b1.tar.bz2 | |
Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux
Pull pcmcia updates from Dominik Brodowski:
"Two minor PCMCIA odd fixes: one replacing zero-length arrays with a
flexible-array member, and one making a local function static"
* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
pcmcia: make pccard_loop_tuple() static
pcmcia: Replace zero-length array with flexible-array
Diffstat (limited to 'include')
| -rw-r--r-- | include/pcmcia/cistpl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h index 59a011101e0e..749320cc9aba 100644 --- a/include/pcmcia/cistpl.h +++ b/include/pcmcia/cistpl.h @@ -161,7 +161,7 @@ typedef struct cistpl_funcid_t { typedef struct cistpl_funce_t { u_char type; - u_char data[0]; + u_char data[]; } cistpl_funce_t; /*====================================================================== @@ -255,7 +255,7 @@ typedef struct cistpl_data_serv_t { u_char escape; u_char encrypt; u_char misc_features; - u_char ccitt_code[0]; + u_char ccitt_code[]; } cistpl_data_serv_t; typedef struct cistpl_fax_serv_t { @@ -265,7 +265,7 @@ typedef struct cistpl_fax_serv_t { u_char encrypt; u_char features_0; u_char features_1; - u_char ccitt_code[0]; + u_char ccitt_code[]; } cistpl_fax_serv_t; typedef struct cistpl_voice_serv_t { |