diff options
Diffstat (limited to 'arch/avr32')
-rw-r--r-- | arch/avr32/Kconfig | 6 | ||||
-rw-r--r-- | arch/avr32/kernel/process.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index 05fe3053dcae..414a8ad97f52 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
@@ -127,13 +127,13 @@ config BOARD_HAMMERHEAD | |||
127 | select CPU_AT32AP7000 | 127 | select CPU_AT32AP7000 |
128 | select USB_ARCH_HAS_HCD | 128 | select USB_ARCH_HAS_HCD |
129 | help | 129 | help |
130 | The Hammerhead platform is built around a AVR32 32-bit microcontroller from Atmel. | 130 | The Hammerhead platform is built around an AVR32 32-bit microcontroller from Atmel. |
131 | It offers versatile peripherals, such as ethernet, usb device, usb host etc. | 131 | It offers versatile peripherals, such as ethernet, usb device, usb host etc. |
132 | 132 | ||
133 | The board also incooperates a power supply and is a Power over Ethernet (PoE) Powered | 133 | The board also incorporates a power supply and is a Power over Ethernet (PoE) Powered |
134 | Device (PD). | 134 | Device (PD). |
135 | 135 | ||
136 | Additonally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is | 136 | Additionally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is |
137 | mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which | 137 | mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which |
138 | will cover even the most exceptional need of memory bandwidth. Together with the onboard | 138 | will cover even the most exceptional need of memory bandwidth. Together with the onboard |
139 | video decoder the board is ready for video processing. | 139 | video decoder the board is ready for video processing. |
diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c index 43ae555ecb33..1bbe1da54869 100644 --- a/arch/avr32/kernel/process.c +++ b/arch/avr32/kernel/process.c | |||
@@ -332,7 +332,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu) | |||
332 | 332 | ||
333 | asmlinkage void ret_from_fork(void); | 333 | asmlinkage void ret_from_fork(void); |
334 | 334 | ||
335 | int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, | 335 | int copy_thread(unsigned long clone_flags, unsigned long usp, |
336 | unsigned long unused, | 336 | unsigned long unused, |
337 | struct task_struct *p, struct pt_regs *regs) | 337 | struct task_struct *p, struct pt_regs *regs) |
338 | { | 338 | { |