Skip to content

L
linux-davinci-2.6.23
Commit fbd91ac2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

parents 6e2324e0 38c0b2c2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
arch/ia64/kernel/setup.c
View file @ fbd91ac2
...@@ -518,7 +518,7 @@ show_cpuinfo (struct seq_file *m, void *v) ...@@ -518,7 +518,7 @@ show_cpuinfo (struct seq_file *m, void *v)
char family[32], features[128], *cp, sep; char family[32], features[128], *cp, sep;
struct cpuinfo_ia64 *c = v; struct cpuinfo_ia64 *c = v;
unsigned long mask; unsigned long mask;
unsigned int proc_freq; unsigned long proc_freq;
int i; int i;
mask = c->features; 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) ...@@ -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 ia64_pci_legacy_write(struct pci_dev *bus, u16 port, u32 val, u8 size)
{ {
int ret = 0; int ret = size;
switch (size) { switch (size) {
case 1: case 1:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment