Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
1dd4dd0c
Commit
1dd4dd0c
authored
Aug 10, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://linuxusb.bkbits.net/pci_hp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
01cf0f73
12518563
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
18 deletions
+21
-18
drivers/pci/Makefile
drivers/pci/Makefile
+2
-1
drivers/pci/compat.c
drivers/pci/compat.c
+14
-0
drivers/pci/names.c
drivers/pci/names.c
+5
-5
drivers/pci/pci.c
drivers/pci/pci.c
+0
-12
No files found.
drivers/pci/Makefile
View file @
1dd4dd0c
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
# Makefile for the PCI bus specific drivers.
# Makefile for the PCI bus specific drivers.
#
#
export-objs
:=
access.o hotplug.o pci-driver.o pci.o pool.o probe.o proc.o search.o
export-objs
:=
access.o hotplug.o pci-driver.o pci.o pool.o
\
probe.o proc.o search.o compat.o
obj-y
+=
access.o probe.o pci.o pool.o quirks.o
\
obj-y
+=
access.o probe.o pci.o pool.o quirks.o
\
compat.o names.o pci-driver.o search.o
compat.o names.o pci-driver.o search.o
...
...
drivers/pci/compat.c
View file @
1dd4dd0c
...
@@ -8,8 +8,11 @@
...
@@ -8,8 +8,11 @@
#include <linux/types.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/pci.h>
/* Obsolete functions, these will be going away... */
int
int
pcibios_present
(
void
)
pcibios_present
(
void
)
{
{
...
@@ -63,3 +66,14 @@ PCI_OP(read, dword, int *)
...
@@ -63,3 +66,14 @@ PCI_OP(read, dword, int *)
PCI_OP
(
write
,
byte
,
char
)
PCI_OP
(
write
,
byte
,
char
)
PCI_OP
(
write
,
word
,
short
)
PCI_OP
(
write
,
word
,
short
)
PCI_OP
(
write
,
dword
,
int
)
PCI_OP
(
write
,
dword
,
int
)
EXPORT_SYMBOL
(
pcibios_present
);
EXPORT_SYMBOL
(
pcibios_read_config_byte
);
EXPORT_SYMBOL
(
pcibios_read_config_word
);
EXPORT_SYMBOL
(
pcibios_read_config_dword
);
EXPORT_SYMBOL
(
pcibios_write_config_byte
);
EXPORT_SYMBOL
(
pcibios_write_config_word
);
EXPORT_SYMBOL
(
pcibios_write_config_dword
);
EXPORT_SYMBOL
(
pcibios_find_class
);
EXPORT_SYMBOL
(
pcibios_find_device
);
drivers/pci/names.c
View file @
1dd4dd0c
...
@@ -32,18 +32,18 @@ struct pci_vendor_info {
...
@@ -32,18 +32,18 @@ struct pci_vendor_info {
* real memory.. Parse the same file multiple times
* real memory.. Parse the same file multiple times
* to get all the info.
* to get all the info.
*/
*/
#define VENDOR( vendor, name ) static char __vendorstr_##vendor[] __initdata = name;
#define VENDOR( vendor, name ) static char __vendorstr_##vendor[] __
dev
initdata = name;
#define ENDVENDOR()
#define ENDVENDOR()
#define DEVICE( vendor, device, name ) static char __devicestr_##vendor##device[] __initdata = name;
#define DEVICE( vendor, device, name ) static char __devicestr_##vendor##device[] __
dev
initdata = name;
#include "devlist.h"
#include "devlist.h"
#define VENDOR( vendor, name ) static struct pci_device_info __devices_##vendor[] __initdata = {
#define VENDOR( vendor, name ) static struct pci_device_info __devices_##vendor[] __
dev
initdata = {
#define ENDVENDOR() };
#define ENDVENDOR() };
#define DEVICE( vendor, device, name ) { 0x##device, 0, __devicestr_##vendor##device },
#define DEVICE( vendor, device, name ) { 0x##device, 0, __devicestr_##vendor##device },
#include "devlist.h"
#include "devlist.h"
static
struct
pci_vendor_info
__initdata
pci_vendor_list
[]
=
{
static
struct
pci_vendor_info
__
dev
initdata
pci_vendor_list
[]
=
{
#define VENDOR( vendor, name ) { 0x##vendor, sizeof(__devices_##vendor) / sizeof(struct pci_device_info), __vendorstr_##vendor, __devices_##vendor },
#define VENDOR( vendor, name ) { 0x##vendor, sizeof(__devices_##vendor) / sizeof(struct pci_device_info), __vendorstr_##vendor, __devices_##vendor },
#define ENDVENDOR()
#define ENDVENDOR()
#define DEVICE( vendor, device, name )
#define DEVICE( vendor, device, name )
...
@@ -121,7 +121,7 @@ pci_class_name(u32 class)
...
@@ -121,7 +121,7 @@ pci_class_name(u32 class)
#else
#else
void
__init
pci_name_device
(
struct
pci_dev
*
dev
)
void
__
dev
init
pci_name_device
(
struct
pci_dev
*
dev
)
{
{
}
}
...
...
drivers/pci/pci.c
View file @
1dd4dd0c
...
@@ -602,18 +602,6 @@ EXPORT_SYMBOL(pci_save_state);
...
@@ -602,18 +602,6 @@ EXPORT_SYMBOL(pci_save_state);
EXPORT_SYMBOL
(
pci_restore_state
);
EXPORT_SYMBOL
(
pci_restore_state
);
EXPORT_SYMBOL
(
pci_enable_wake
);
EXPORT_SYMBOL
(
pci_enable_wake
);
/* Obsolete functions */
EXPORT_SYMBOL
(
pcibios_present
);
EXPORT_SYMBOL
(
pcibios_read_config_byte
);
EXPORT_SYMBOL
(
pcibios_read_config_word
);
EXPORT_SYMBOL
(
pcibios_read_config_dword
);
EXPORT_SYMBOL
(
pcibios_write_config_byte
);
EXPORT_SYMBOL
(
pcibios_write_config_word
);
EXPORT_SYMBOL
(
pcibios_write_config_dword
);
EXPORT_SYMBOL
(
pcibios_find_class
);
EXPORT_SYMBOL
(
pcibios_find_device
);
/* Quirk info */
/* Quirk info */
EXPORT_SYMBOL
(
isa_dma_bridge_buggy
);
EXPORT_SYMBOL
(
isa_dma_bridge_buggy
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment