Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
fbd91ac2
Commit
fbd91ac2
authored
Jan 05, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
parents
6e2324e0
38c0b2c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
arch/ia64/kernel/setup.c
arch/ia64/kernel/setup.c
+1
-1
arch/ia64/pci/pci.c
arch/ia64/pci/pci.c
+1
-1
No files found.
arch/ia64/kernel/setup.c
View file @
fbd91ac2
...
...
@@ -518,7 +518,7 @@ show_cpuinfo (struct seq_file *m, void *v)
char
family
[
32
],
features
[
128
],
*
cp
,
sep
;
struct
cpuinfo_ia64
*
c
=
v
;
unsigned
long
mask
;
unsigned
int
proc_freq
;
unsigned
long
proc_freq
;
int
i
;
mask
=
c
->
features
;
...
...
arch/ia64/pci/pci.c
View file @
fbd91ac2
...
...
@@ -700,7 +700,7 @@ int ia64_pci_legacy_read(struct pci_bus *bus, u16 port, u32 *val, u8 size)
*/
int
ia64_pci_legacy_write
(
struct
pci_dev
*
bus
,
u16
port
,
u32
val
,
u8
size
)
{
int
ret
=
0
;
int
ret
=
size
;
switch
(
size
)
{
case
1
:
...
...
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