aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-05 14:18:15 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-05 14:18:15 -0800
commitfbd91ac22229fdb89f0dd2eaa11dd663f2ba1a92 (patch)
treed4734ba408aba217d8dc44cd6a2741a40c62b407
parent6e2324e0fbb3a075382359b1cbc392a3f4ec8792 (diff)
parent38c0b2c2aaab5595a140ade4410e01d407fff751 (diff)
downloadkernel_samsung_smdk4412-fbd91ac22229fdb89f0dd2eaa11dd663f2ba1a92.zip
kernel_samsung_smdk4412-fbd91ac22229fdb89f0dd2eaa11dd663f2ba1a92.tar.gz
kernel_samsung_smdk4412-fbd91ac22229fdb89f0dd2eaa11dd663f2ba1a92.tar.bz2
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
-rw-r--r--arch/ia64/kernel/setup.c2
-rw-r--r--arch/ia64/pci/pci.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 088e5dd..c33305d 100644
--- 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
index 20d76fa..30dbc98 100644
--- 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: