UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Linus Torvalds 2006-01-05 14:18:15 -08:00
parent 6e2324e0fb 38c0b2c2aa
commit fbd91ac222
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/kernel/setup.c
View File

@ -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;

2
arch/ia64/pci/pci.c
View File

@ -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: