diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 20:31:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 20:31:31 +0200 |
| commit | 61434392f797cf89872bda87dff8b3395edf4108 (patch) | |
| tree | 489e344b0a5142dd4dc74ba3f4972592b90bacec /include | |
| parent | [WATCHDOG] Fix it8712f_wdt.c wrong byte order accessing WDT_TIMEOUT (diff) | |
| parent | [MIPS] XSS1500: Fix compilation (diff) | |
| download | linux-61434392f797cf89872bda87dff8b3395edf4108.tar.xz linux-61434392f797cf89872bda87dff8b3395edf4108.zip | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus:
[MIPS] XSS1500: Fix compilation
[MIPS] Bigsur: make defconfig more useful.
[MIPS] Alchemy: work around clock misdetection on early Au1000
[MIPS] Add missing 4KEC TLB refill handler
[MIPS] BCM1480: Fix PCI/HT IO access
[MIPS] Fix the installation condition of MIPS clocksource
[MIPS] Check for GCC r10k-cache-barrier support
[MIPS] I8253: Export i2853_lock to modules.
[MIPS] VPE loader: Check result of memory allocation.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/mach-au1x00/au1000.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index cb18af989645..5bb57bf2b9d7 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h @@ -1786,6 +1786,7 @@ struct cpu_spec { char *cpu_name; unsigned char cpu_od; /* Set Config[OD] */ unsigned char cpu_bclk; /* Enable BCLK switching */ + unsigned char cpu_pll_wo; /* sys_cpupll reg. write-only */ }; extern struct cpu_spec cpu_specs[]; |