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
Kirill Smelkov
linux
Commits
dbfa1b24
Commit
dbfa1b24
authored
Sep 08, 2003
by
Greg Kroah-Hartman
Browse files
Options
Browse Files
Download
Plain Diff
Merge kroah.com:/home/greg/linux/BK/bleed-2.5
into kroah.com:/home/greg/linux/BK/pci-2.6
parents
abe68253
7cc691ed
Changes
25
Show whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
75 additions
and
75 deletions
+75
-75
drivers/pci/hotplug/acpiphp.h
drivers/pci/hotplug/acpiphp.h
+6
-6
drivers/pci/hotplug/acpiphp_core.c
drivers/pci/hotplug/acpiphp_core.c
+6
-6
drivers/pci/hotplug/acpiphp_glue.c
drivers/pci/hotplug/acpiphp_glue.c
+3
-3
drivers/pci/hotplug/acpiphp_pci.c
drivers/pci/hotplug/acpiphp_pci.c
+6
-6
drivers/pci/hotplug/acpiphp_res.c
drivers/pci/hotplug/acpiphp_res.c
+6
-6
drivers/pci/hotplug/cpci_hotplug.h
drivers/pci/hotplug/cpci_hotplug.h
+3
-3
drivers/pci/hotplug/cpci_hotplug_core.c
drivers/pci/hotplug/cpci_hotplug_core.c
+3
-3
drivers/pci/hotplug/cpci_hotplug_pci.c
drivers/pci/hotplug/cpci_hotplug_pci.c
+1
-1
drivers/pci/hotplug/cpqphp.h
drivers/pci/hotplug/cpqphp.h
+3
-3
drivers/pci/hotplug/cpqphp_core.c
drivers/pci/hotplug/cpqphp_core.c
+3
-3
drivers/pci/hotplug/cpqphp_ctrl.c
drivers/pci/hotplug/cpqphp_ctrl.c
+3
-3
drivers/pci/hotplug/cpqphp_nvram.c
drivers/pci/hotplug/cpqphp_nvram.c
+3
-3
drivers/pci/hotplug/cpqphp_nvram.h
drivers/pci/hotplug/cpqphp_nvram.h
+2
-2
drivers/pci/hotplug/cpqphp_pci.c
drivers/pci/hotplug/cpqphp_pci.c
+3
-3
drivers/pci/hotplug/cpqphp_sysfs.c
drivers/pci/hotplug/cpqphp_sysfs.c
+3
-3
drivers/pci/hotplug/fakephp.c
drivers/pci/hotplug/fakephp.c
+3
-3
drivers/pci/hotplug/ibmphp.h
drivers/pci/hotplug/ibmphp.h
+2
-2
drivers/pci/hotplug/ibmphp_core.c
drivers/pci/hotplug/ibmphp_core.c
+2
-2
drivers/pci/hotplug/ibmphp_ebda.c
drivers/pci/hotplug/ibmphp_ebda.c
+2
-2
drivers/pci/hotplug/ibmphp_hpc.c
drivers/pci/hotplug/ibmphp_hpc.c
+1
-1
drivers/pci/hotplug/ibmphp_pci.c
drivers/pci/hotplug/ibmphp_pci.c
+2
-2
drivers/pci/hotplug/ibmphp_res.c
drivers/pci/hotplug/ibmphp_res.c
+2
-2
drivers/pci/hotplug/pci_hotplug.h
drivers/pci/hotplug/pci_hotplug.h
+3
-3
drivers/pci/hotplug/pci_hotplug_core.c
drivers/pci/hotplug/pci_hotplug_core.c
+2
-2
drivers/pci/hotplug/pcihp_skeleton.c
drivers/pci/hotplug/pcihp_skeleton.c
+2
-2
No files found.
drivers/pci/hotplug/acpiphp.h
View file @
dbfa1b24
/*
/*
* ACPI PCI Hot Plug Controller Driver
* ACPI PCI Hot Plug Controller Driver
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM Corp.
* Copyright (
C
) 2001 IBM Corp.
* Copyright (
c
) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com)
* Copyright (
C
) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com)
* Copyright (
c
) 2002,2003 Takayoshi Kochi (t-kochi@bq.jp.nec.com)
* Copyright (
C
) 2002,2003 Takayoshi Kochi (t-kochi@bq.jp.nec.com)
* Copyright (
c
) 2002,2003 NEC Corporation
* Copyright (
C
) 2002,2003 NEC Corporation
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/acpiphp_core.c
View file @
dbfa1b24
/*
/*
* ACPI PCI Hot Plug Controller Driver
* ACPI PCI Hot Plug Controller Driver
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM Corp.
* Copyright (
C
) 2001 IBM Corp.
* Copyright (
c
) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com)
* Copyright (
C
) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com)
* Copyright (
c
) 2002,2003 Takayoshi Kochi (t-kochi@bq.jp.nec.com)
* Copyright (
C
) 2002,2003 Takayoshi Kochi (t-kochi@bq.jp.nec.com)
* Copyright (
c
) 2002,2003 NEC Corporation
* Copyright (
C
) 2002,2003 NEC Corporation
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/acpiphp_glue.c
View file @
dbfa1b24
/*
/*
* ACPI PCI HotPlug glue functions to ACPI CA subsystem
* ACPI PCI HotPlug glue functions to ACPI CA subsystem
*
*
* Copyright (
c
) 2002,2003 Takayoshi Kochi (t-kochi@bq.jp.nec.com)
* Copyright (
C
) 2002,2003 Takayoshi Kochi (t-kochi@bq.jp.nec.com)
* Copyright (
c
) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com)
* Copyright (
C
) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com)
* Copyright (
c
) 2002,2003 NEC Corporation
* Copyright (
C
) 2002,2003 NEC Corporation
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/acpiphp_pci.c
View file @
dbfa1b24
/*
/*
* ACPI PCI HotPlug PCI configuration space management
* ACPI PCI HotPlug PCI configuration space management
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001,2002 IBM Corp.
* Copyright (
C
) 2001,2002 IBM Corp.
* Copyright (
c
) 2002 Takayoshi Kochi (t-kochi@bq.jp.nec.com)
* Copyright (
C
) 2002 Takayoshi Kochi (t-kochi@bq.jp.nec.com)
* Copyright (
c
) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com)
* Copyright (
C
) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com)
* Copyright (
c
) 2002 NEC Corporation
* Copyright (
C
) 2002 NEC Corporation
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/acpiphp_res.c
View file @
dbfa1b24
/*
/*
* ACPI PCI HotPlug Utility functions
* ACPI PCI HotPlug Utility functions
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM Corp.
* Copyright (
C
) 2001 IBM Corp.
* Copyright (
c
) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com)
* Copyright (
C
) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com)
* Copyright (
c
) 2002 Takayoshi Kochi (t-kochi@bq.jp.nec.com)
* Copyright (
C
) 2002 Takayoshi Kochi (t-kochi@bq.jp.nec.com)
* Copyright (
c
) 2002 NEC Corporation
* Copyright (
C
) 2002 NEC Corporation
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/cpci_hotplug.h
View file @
dbfa1b24
/*
/*
* CompactPCI Hot Plug Core Functions
* CompactPCI Hot Plug Core Functions
*
*
* Copyright (
c
) 2002 SOMA Networks, Inc.
* Copyright (
C
) 2002 SOMA Networks, Inc.
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM Corp.
* Copyright (
C
) 2001 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/cpci_hotplug_core.c
View file @
dbfa1b24
/*
/*
* CompactPCI Hot Plug Driver
* CompactPCI Hot Plug Driver
*
*
* Copyright (
c
) 2002 SOMA Networks, Inc.
* Copyright (
C
) 2002 SOMA Networks, Inc.
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM Corp.
* Copyright (
C
) 2001 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/cpci_hotplug_pci.c
View file @
dbfa1b24
/*
/*
* CompactPCI Hot Plug Driver PCI functions
* CompactPCI Hot Plug Driver PCI functions
*
*
* Copyright (
c
) 2002 by SOMA Networks, Inc.
* Copyright (
C
) 2002 by SOMA Networks, Inc.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/cpqphp.h
View file @
dbfa1b24
/*
/*
* Compaq Hot Plug Controller Driver
* Compaq Hot Plug Controller Driver
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM
* Copyright (
C
) 2001 IBM
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/cpqphp_core.c
View file @
dbfa1b24
/*
/*
* Compaq Hot Plug Controller Driver
* Compaq Hot Plug Controller Driver
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM Corp.
* Copyright (
C
) 2001 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/cpqphp_ctrl.c
View file @
dbfa1b24
/*
/*
* Compaq Hot Plug Controller Driver
* Compaq Hot Plug Controller Driver
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM Corp.
* Copyright (
C
) 2001 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/cpqphp_nvram.c
View file @
dbfa1b24
/*
/*
* Compaq Hot Plug Controller Driver
* Compaq Hot Plug Controller Driver
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM Corp.
* Copyright (
C
) 2001 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/cpqphp_nvram.h
View file @
dbfa1b24
/*
/*
* Compaq Hot Plug Controller Driver
* Compaq Hot Plug Controller Driver
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/cpqphp_pci.c
View file @
dbfa1b24
/*
/*
* Compaq Hot Plug Controller Driver
* Compaq Hot Plug Controller Driver
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM Corp.
* Copyright (
C
) 2001 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/cpqphp_sysfs.c
View file @
dbfa1b24
/*
/*
* Compaq Hot Plug Controller Driver
* Compaq Hot Plug Controller Driver
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001,2003 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001,2003 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM Corp.
* Copyright (
C
) 2001 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/fakephp.c
View file @
dbfa1b24
/*
/*
* Fake PCI Hot Plug Controller Driver
* Fake PCI Hot Plug Controller Driver
*
*
* Copyright (
c
) 2003 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (
C
) 2003 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (
c
) 2003 IBM Corp.
* Copyright (
C
) 2003 IBM Corp.
* Copyright (
c
) 2003 Rolf Eike Beer <eike-kernel@sf-tec.de>
* Copyright (
C
) 2003 Rolf Eike Beer <eike-kernel@sf-tec.de>
*
*
* Based on ideas and code from:
* Based on ideas and code from:
* Vladimir Kondratiev <vladimir.kondratiev@intel.com>
* Vladimir Kondratiev <vladimir.kondratiev@intel.com>
...
...
drivers/pci/hotplug/ibmphp.h
View file @
dbfa1b24
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
*
*
* Written By: Jyoti Shah, Tong Yu, Irene Zubarev, IBM Corporation
* Written By: Jyoti Shah, Tong Yu, Irene Zubarev, IBM Corporation
*
*
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001-2003 IBM Corp.
* Copyright (
C
) 2001-2003 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/ibmphp_core.c
View file @
dbfa1b24
...
@@ -3,8 +3,8 @@
...
@@ -3,8 +3,8 @@
*
*
* Written By: Chuck Cole, Jyoti Shah, Tong Yu, Irene Zubarev, IBM Corporation
* Written By: Chuck Cole, Jyoti Shah, Tong Yu, Irene Zubarev, IBM Corporation
*
*
* Copyright (
c
) 2001,2003 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001,2003 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001-2003 IBM Corp.
* Copyright (
C
) 2001-2003 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/ibmphp_ebda.c
View file @
dbfa1b24
...
@@ -3,8 +3,8 @@
...
@@ -3,8 +3,8 @@
*
*
* Written By: Tong Yu, IBM Corporation
* Written By: Tong Yu, IBM Corporation
*
*
* Copyright (
c
) 2001,2003 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001,2003 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001-2003 IBM Corp.
* Copyright (
C
) 2001-2003 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/ibmphp_hpc.c
View file @
dbfa1b24
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
*
*
* Written By: Jyoti Shah, IBM Corporation
* Written By: Jyoti Shah, IBM Corporation
*
*
* Copyright (
c
) 2001-2003 IBM Corp.
* Copyright (
C
) 2001-2003 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/ibmphp_pci.c
View file @
dbfa1b24
...
@@ -3,8 +3,8 @@
...
@@ -3,8 +3,8 @@
*
*
* Written By: Irene Zubarev, IBM Corporation
* Written By: Irene Zubarev, IBM Corporation
*
*
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001,2002 IBM Corp.
* Copyright (
C
) 2001,2002 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/ibmphp_res.c
View file @
dbfa1b24
...
@@ -3,8 +3,8 @@
...
@@ -3,8 +3,8 @@
*
*
* Written By: Irene Zubarev, IBM Corporation
* Written By: Irene Zubarev, IBM Corporation
*
*
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001,2002 IBM Corp.
* Copyright (
C
) 2001,2002 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/pci_hotplug.h
View file @
dbfa1b24
/*
/*
* PCI HotPlug Core Functions
* PCI HotPlug Core Functions
*
*
* Copyright (
c
) 1995,2001 Compaq Computer Corporation
* Copyright (
C
) 1995,2001 Compaq Computer Corporation
* Copyright (
c
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001 IBM Corp.
* Copyright (
C
) 2001 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/pci_hotplug_core.c
View file @
dbfa1b24
/*
/*
* PCI HotPlug Controller Core
* PCI HotPlug Controller Core
*
*
* Copyright (
c
) 2001-2002 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001-2002 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001-2002 IBM Corp.
* Copyright (
C
) 2001-2002 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
drivers/pci/hotplug/pcihp_skeleton.c
View file @
dbfa1b24
/*
/*
* PCI Hot Plug Controller Skeleton Driver - 0.2
* PCI Hot Plug Controller Skeleton Driver - 0.2
*
*
* Copyright (
c
) 2001,2003 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
C
) 2001,2003 Greg Kroah-Hartman (greg@kroah.com)
* Copyright (
c
) 2001,2003 IBM Corp.
* Copyright (
C
) 2001,2003 IBM Corp.
*
*
* All rights reserved.
* All rights reserved.
*
*
...
...
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