diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-12 20:01:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-12 20:01:16 -0800 |
| commit | fb4532b5018d6c423ec37045965f316dc33f145c (patch) | |
| tree | dc5fde045fc2e984ef7d0bc0c1aeb205a62fc7d0 /include | |
| parent | bb8d2379e00686e52252cc059e61a229c4019803 (diff) | |
| parent | 21846253621ce19ac8d7533053e9136ce22734b9 (diff) | |
Merge bk://ldm.bkbits.net/linux-2.5-core
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/elf.h | 11 | ||||
| -rw-r--r-- | include/linux/moduleloader.h | 8 | ||||
| -rw-r--r-- | include/linux/pnp.h | 6 |
3 files changed, 9 insertions, 16 deletions
diff --git a/include/linux/elf.h b/include/linux/elf.h index 4435d0be3575..bef237b527bd 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h @@ -156,11 +156,12 @@ typedef __s64 Elf64_Sxword; #define STT_SECTION 3 #define STT_FILE 4 -#define ELF32_ST_BIND(x) ((x) >> 4) -#define ELF32_ST_TYPE(x) (((unsigned int) x) & 0xf) - -#define ELF64_ST_BIND(x) ((x) >> 4) -#define ELF64_ST_TYPE(x) (((unsigned int) x) & 0xf) +#define ELF_ST_BIND(x) ((x) >> 4) +#define ELF_ST_TYPE(x) (((unsigned int) x) & 0xf) +#define ELF32_ST_BIND(x) ELF_ST_BIND(x) +#define ELF32_ST_TYPE(x) ELF_ST_TYPE(x) +#define ELF64_ST_BIND(x) ELF_ST_BIND(x) +#define ELF64_ST_TYPE(x) ELF_ST_TYPE(x) /* Symbolic values for the entries in the auxiliary table put on the initial stack */ diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h index 991e9cdf3213..0c9e9a69f8ba 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -5,14 +5,6 @@ #include <linux/module.h> #include <linux/elf.h> -/* Helper function for arch-specific module loaders */ -unsigned long find_symbol_internal(Elf_Shdr *sechdrs, - unsigned int symindex, - const char *strtab, - const char *name, - struct module *mod, - struct kernel_symbol_group **group); - /* These must be implemented by the specific architecture */ /* Adjust arch-specific sections. Return 0 on success. */ diff --git a/include/linux/pnp.h b/include/linux/pnp.h index b97e8f64122f..d138647ff235 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h @@ -189,7 +189,7 @@ struct pnp_device_id { unsigned long driver_data; /* data private to the driver */ }; -struct pnp_card_id { +struct pnp_card_device_id { char id[7]; unsigned long driver_data; /* data private to the driver */ struct { @@ -216,9 +216,9 @@ struct pnp_driver { struct pnpc_driver { struct list_head node; char *name; - const struct pnp_card_id *id_table; + const struct pnp_card_device_id *id_table; unsigned int flags; - int (*probe) (struct pnp_card *card, const struct pnp_card_id *card_id); + int (*probe) (struct pnp_card *card, const struct pnp_card_device_id *card_id); void (*remove) (struct pnp_card *card); struct device_driver driver; }; |