diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-03-25 14:07:04 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 19:22:52 +0300 |
| commit | c721bccece2b3abca4f7b0b95108e68b78445cec (patch) | |
| tree | f8775f626554bd23c8224ee496a2d94191f9a7e5 /drivers/isdn/hysdn/hysdn_init.c | |
| parent | 5b7b18ccdeb17dcc4a2ddbf4ce87094c7365f4b9 (diff) | |
| download | linux-c721bccece2b3abca4f7b0b95108e68b78445cec.tar.xz | |
[PATCH] hysdn: remove custom types
hysdn defines its own types: ulong, uint, uchar and word.
Problem is, the module_param macros rely upon some of those identifiers having
special meanings too. The net effect is that module_param() and friends
cannot be used in ISDN because of this namespace clash.
So remove the hysdn-private defines and open-code them all.
Cc: Karsten Keil <kkeil@suse.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/isdn/hysdn/hysdn_init.c')
| -rw-r--r-- | drivers/isdn/hysdn/hysdn_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c index cb791f8e793a..b75ac5af236a 100644 --- a/drivers/isdn/hysdn/hysdn_init.c +++ b/drivers/isdn/hysdn/hysdn_init.c @@ -41,8 +41,8 @@ hysdn_card *card_root = NULL; /* pointer to first card */ /* the last entry contains all 0 */ /**********************************************/ static struct { - word subid; /* PCI sub id */ - uchar cardtyp; /* card type assigned */ + unsigned short subid; /* PCI sub id */ + unsigned char cardtyp; /* card type assigned */ } pci_subid_map[] = { { |