diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-09-09 03:18:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-09-09 03:18:29 -0700 |
| commit | 8a0f08e246befbcbeef10c3df5f2efae308ef55f (patch) | |
| tree | d50c44cfcc986f4c77151a8898168bc4f734494d /include | |
| parent | 36b6ca012a1e8926525a8dd21eeb9c6ca46bd92b (diff) | |
| parent | 159b0104bdf27e5287a03c4660608eeb87d70c7c (diff) | |
Merge bk://linuxusb.bkbits.net/linus-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/mtrr.h | 7 | ||||
| -rw-r--r-- | include/linux/pci.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-i386/mtrr.h b/include/asm-i386/mtrr.h index ff3ea870d0d6..f2727e61fe63 100644 --- a/include/asm-i386/mtrr.h +++ b/include/asm-i386/mtrr.h @@ -115,13 +115,6 @@ static __inline__ void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) {;} # endif -/* The following functions are for initialisation: don't use them! */ -extern int mtrr_init (void); -# if defined(CONFIG_SMP) && defined(CONFIG_MTRR) -extern void mtrr_init_boot_cpu (void); -extern void mtrr_init_secondary_cpu (void); -# endif - #endif #endif /* _LINUX_MTRR_H */ diff --git a/include/linux/pci.h b/include/linux/pci.h index b82ec8e41174..79d909a8643a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -634,7 +634,6 @@ void pci_insert_device(struct pci_dev *, struct pci_bus *); void pci_remove_device(struct pci_dev *); struct pci_driver *pci_dev_driver(const struct pci_dev *); const struct pci_device_id *pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev); -void pci_announce_device_to_drivers(struct pci_dev *); unsigned int pci_do_scan_bus(struct pci_bus *bus); struct pci_bus * pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr); |