Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

…it/aegl/linux-2.6
git-mirror · Jan 5, 2006 · fbd91ac · fbd91ac
2 parents 6e2324e + 38c0b2c
commit fbd91ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
@@ -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;

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
@@ -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: