asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linus Torvalds 2006-01-05 14:18:15 -08:00
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;
struct cpuinfo_ia64 *c = v;
unsigned long mask;
unsigned int proc_freq;
unsigned long proc_freq;
int i;
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 ret = 0;
int ret = size;
switch (size) {
case 1: