diff options
Diffstat (limited to 'include/asm-arm')
34 files changed, 45 insertions, 60 deletions
diff --git a/include/asm-arm/arch-clps711x/entry-macro.S b/include/asm-arm/arch-clps711x/entry-macro.S index 21f6ee4858191..de4481dd8ba0e 100644 --- a/include/asm-arm/arch-clps711x/entry-macro.S +++ b/include/asm-arm/arch-clps711x/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-CLPS711x/entry-macro.S + * include/asm-arm/arch-clps711x/entry-macro.S * * Low-level IRQ helper macros for CLPS711X-based platforms * diff --git a/include/asm-arm/arch-ebsa285/entry-macro.S b/include/asm-arm/arch-ebsa285/entry-macro.S index cf10ac96fdded..ce812d4f4a336 100644 --- a/include/asm-arm/arch-ebsa285/entry-macro.S +++ b/include/asm-arm/arch-ebsa285/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-footbridge/entry-macro.S + * include/asm-arm/arch-ebsa285/entry-macro.S * * Low-level IRQ helper macros for footbridge-based platforms * diff --git a/include/asm-arm/arch-h720x/system.h b/include/asm-arm/arch-h720x/system.h index 09eda84592ffc..8dc1460b23052 100644 --- a/include/asm-arm/arch-h720x/system.h +++ b/include/asm-arm/arch-h720x/system.h @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-h720x/system.h + * linux/include/asm-arm/arch-h720x/system.h * * Copyright (C) 2001-2002 Jungjun Kim, Hynix Semiconductor Inc. * diff --git a/include/asm-arm/arch-ixp4xx/system.h b/include/asm-arm/arch-ixp4xx/system.h index 73589aad8dd60..8e1db423b1cc2 100644 --- a/include/asm-arm/arch-ixp4xx/system.h +++ b/include/asm-arm/arch-ixp4xx/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-ixp4x//system.h + * include/asm-arm/arch-ixp4xx/system.h * * Copyright (C) 2002 Intel Corporation. * diff --git a/include/asm-arm/arch-omap/dmtimer.h b/include/asm-arm/arch-omap/dmtimer.h index b5f3a71b899db..fefb276ed4024 100644 --- a/include/asm-arm/arch-omap/dmtimer.h +++ b/include/asm-arm/arch-omap/dmtimer.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arm/arch-omap/dmtimer.h + * linux/include/asm-arm/arch-omap/dmtimer.h * * OMAP Dual-Mode Timers * diff --git a/include/asm-arm/arch-omap/mcbsp.h b/include/asm-arm/arch-omap/mcbsp.h index ed0dde4f72196..c7a0cc1c4e939 100644 --- a/include/asm-arm/arch-omap/mcbsp.h +++ b/include/asm-arm/arch-omap/mcbsp.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/gpio.h + * linux/include/asm-arm/arch-omap/mcbsp.h * * Defines for Multi-Channel Buffered Serial Port * diff --git a/include/asm-arm/arch-omap/pm.h b/include/asm-arm/arch-omap/pm.h index e46623c61a729..14588059981f9 100644 --- a/include/asm-arm/arch-omap/pm.h +++ b/include/asm-arm/arch-omap/pm.h @@ -1,5 +1,5 @@ /* - * linux/include/asm/arch-omap/pm.h + * linux/include/asm-arm/arch-omap/pm.h * * Header file for OMAP Power Management Routines * diff --git a/include/asm-arm/arch-pnx4008/clock.h b/include/asm-arm/arch-pnx4008/clock.h index 91ae0030fdf28..ce155e1612690 100644 --- a/include/asm-arm/arch-pnx4008/clock.h +++ b/include/asm-arm/arch-pnx4008/clock.h @@ -32,6 +32,7 @@ struct clk; #define KEYCLKCTRL_REG (PWRMAN_VA_BASE + 0xb0) #define TSCLKCTRL_REG (PWRMAN_VA_BASE + 0xb4) #define PWMCLKCTRL_REG (PWRMAN_VA_BASE + 0xb8) +#define TIMCLKCTRL_REG (PWRMAN_VA_BASE + 0xbc) #define SPICTRL_REG (PWRMAN_VA_BASE + 0xc4) #define FLASHCLKCTRL_REG (PWRMAN_VA_BASE + 0xc8) #define UART3CLK_REG (PWRMAN_VA_BASE + 0xd0) diff --git a/include/asm-arm/arch-pnx4008/platform.h b/include/asm-arm/arch-pnx4008/platform.h index 485a3651b4d7e..2613c7c669b17 100644 --- a/include/asm-arm/arch-pnx4008/platform.h +++ b/include/asm-arm/arch-pnx4008/platform.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pnx4008/platfrom.h + * include/asm-arm/arch-pnx4008/platform.h * * PNX4008 Base addresses - header file * diff --git a/include/asm-arm/arch-pxa/pxafb.h b/include/asm-arm/arch-pxa/pxafb.h index aba9b30f42490..81c3928d608c8 100644 --- a/include/asm-arm/arch-pxa/pxafb.h +++ b/include/asm-arm/arch-pxa/pxafb.h @@ -12,12 +12,14 @@ * published by the Free Software Foundation. */ +#include <linux/fb.h> + /* * This structure describes the machine which we are running on. * It is set in linux/arch/arm/mach-pxa/machine_name.c and used in the probe routine * of linux/drivers/video/pxafb.c */ -struct pxafb_mach_info { +struct pxafb_mode_info { u_long pixclock; u_short xres; @@ -34,6 +36,14 @@ struct pxafb_mach_info { u_char sync; u_int cmap_greyscale:1, + unused:31; +}; + +struct pxafb_mach_info { + struct pxafb_mode_info *modes; + unsigned int num_modes; + + u_int fixed_modes:1, cmap_inverse:1, cmap_static:1, unused:29; @@ -62,7 +72,7 @@ struct pxafb_mach_info { u_int lccr3; void (*pxafb_backlight_power)(int); - void (*pxafb_lcd_power)(int); + void (*pxafb_lcd_power)(int, struct fb_var_screeninfo *); }; void set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info); diff --git a/include/asm-arm/arch-pxa/spitz.h b/include/asm-arm/arch-pxa/spitz.h index 62e1fe4d025f9..4953dd324d4d1 100644 --- a/include/asm-arm/arch-pxa/spitz.h +++ b/include/asm-arm/arch-pxa/spitz.h @@ -15,6 +15,8 @@ #define __ASM_ARCH_SPITZ_H 1 #endif +#include <linux/fb.h> + /* Spitz/Akita GPIOs */ #define SPITZ_GPIO_KEY_INT (0) /* Key Interrupt */ @@ -155,4 +157,4 @@ extern struct platform_device spitzscoop2_device; extern struct platform_device spitzssp_device; extern struct sharpsl_charger_machinfo spitz_pm_machinfo; -extern void spitz_lcd_power(int on); +extern void spitz_lcd_power(int on, struct fb_var_screeninfo *var); diff --git a/include/asm-arm/arch-s3c2410/fb.h b/include/asm-arm/arch-s3c2410/fb.h index 71161797bc898..90894214cace0 100644 --- a/include/asm-arm/arch-s3c2410/fb.h +++ b/include/asm-arm/arch-s3c2410/fb.h @@ -1,4 +1,4 @@ -/* linux/include/asm/arch-s3c2410/fb.h +/* linux/include/asm-arm/arch-s3c2410/fb.h * * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org> * diff --git a/include/asm-arm/arch-s3c2410/regs-adc.h b/include/asm-arm/arch-s3c2410/regs-adc.h index c7b90b3ecc9e3..3196a2849e8ae 100644 --- a/include/asm-arm/arch-s3c2410/regs-adc.h +++ b/include/asm-arm/arch-s3c2410/regs-adc.h @@ -1,4 +1,4 @@ -/* linux/include/asm/arch-s3c2410/regs-adc.h +/* linux/include/asm-arm/arch-s3c2410/regs-adc.h * * Copyright (c) 2004 Shannon Holland <holland@loser.net> * diff --git a/include/asm-arm/arch-s3c2410/regs-clock.h b/include/asm-arm/arch-s3c2410/regs-clock.h index b2f4690c07917..e39656b7a0862 100644 --- a/include/asm-arm/arch-s3c2410/regs-clock.h +++ b/include/asm-arm/arch-s3c2410/regs-clock.h @@ -1,4 +1,4 @@ -/* linux/include/asm/arch-s3c2410/regs-clock.h +/* linux/include/asm-arm/arch-s3c2410/regs-clock.h * * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk> * http://armlinux.simtec.co.uk/ diff --git a/include/asm-arm/arch-s3c2410/regs-dsc.h b/include/asm-arm/arch-s3c2410/regs-dsc.h index a0a1248751646..c0748511edbc8 100644 --- a/include/asm-arm/arch-s3c2410/regs-dsc.h +++ b/include/asm-arm/arch-s3c2410/regs-dsc.h @@ -1,4 +1,4 @@ -/* linux/include/asm/hardware/s3c2410/regs-dsc.h +/* linux/include/asm-arm/arch-s3c2410/regs-dsc.h * * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-gpio.h b/include/asm-arm/arch-s3c2410/regs-gpio.h index 93c49432db956..b2893e32a2361 100644 --- a/include/asm-arm/arch-s3c2410/regs-gpio.h +++ b/include/asm-arm/arch-s3c2410/regs-gpio.h @@ -1,4 +1,4 @@ -/* linux/include/asm/hardware/s3c2410/regs-gpio.h +/* linux/include/asm-arm/arch-s3c2410/regs-gpio.h * * Copyright (c) 2003,2004 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-gpioj.h b/include/asm-arm/arch-s3c2410/regs-gpioj.h index 91cefa2604974..02131a5a1d3af 100644 --- a/include/asm-arm/arch-s3c2410/regs-gpioj.h +++ b/include/asm-arm/arch-s3c2410/regs-gpioj.h @@ -1,4 +1,4 @@ -/* linux/include/asm/hardware/s3c2410/regs-gpioj.h +/* linux/include/asm-arm/arch-s3c2410/regs-gpioj.h * * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-iis.h b/include/asm-arm/arch-s3c2410/regs-iis.h index 72cd2509822e1..eaf77916a602e 100644 --- a/include/asm-arm/arch-s3c2410/regs-iis.h +++ b/include/asm-arm/arch-s3c2410/regs-iis.h @@ -1,4 +1,4 @@ -/* linux/include/asm/arch-s3c2410/regs-iis.h +/* linux/include/asm-arm/arch-s3c2410/regs-iis.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-irq.h b/include/asm-arm/arch-s3c2410/regs-irq.h index 29fb8ef670f07..498184cb8adcf 100644 --- a/include/asm-arm/arch-s3c2410/regs-irq.h +++ b/include/asm-arm/arch-s3c2410/regs-irq.h @@ -1,4 +1,4 @@ -/* linux/include/asm/arch-s3c2410/regs-irq.h +/* linux/include/asm-arm/arch-s3c2410/regs-irq.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-lcd.h b/include/asm-arm/arch-s3c2410/regs-lcd.h index 6d7881c8cfc8e..b7faeb04c0ffb 100644 --- a/include/asm-arm/arch-s3c2410/regs-lcd.h +++ b/include/asm-arm/arch-s3c2410/regs-lcd.h @@ -1,4 +1,4 @@ -/* linux/include/asm/arch-s3c2410/regs-lcd.h +/* linux/include/asm-arm/arch-s3c2410/regs-lcd.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-rtc.h b/include/asm-arm/arch-s3c2410/regs-rtc.h index cd88fd634d12b..93b03c49710a5 100644 --- a/include/asm-arm/arch-s3c2410/regs-rtc.h +++ b/include/asm-arm/arch-s3c2410/regs-rtc.h @@ -1,4 +1,4 @@ -/* linux/include/asm/arch-s3c2410/regs-rtc.h +/* linux/include/asm-arm/arch-s3c2410/regs-rtc.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-sdi.h b/include/asm-arm/arch-s3c2410/regs-sdi.h index 06e716e5b46d1..bb9d30b72952c 100644 --- a/include/asm-arm/arch-s3c2410/regs-sdi.h +++ b/include/asm-arm/arch-s3c2410/regs-sdi.h @@ -1,4 +1,4 @@ -/* linux/include/asm/arch-s3c2410/regs-sdi.h +/* linux/include/asm-arm/arch-s3c2410/regs-sdi.h * * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-timer.h b/include/asm-arm/arch-s3c2410/regs-timer.h index 731918e778310..6f8fe432fe3a9 100644 --- a/include/asm-arm/arch-s3c2410/regs-timer.h +++ b/include/asm-arm/arch-s3c2410/regs-timer.h @@ -1,4 +1,4 @@ -/* linux/include/asm/arch-s3c2410/regs-timer.h +/* linux/include/asm-arm/arch-s3c2410/regs-timer.h * * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> * http://www.simtec.co.uk/products/SWLINUX/ diff --git a/include/asm-arm/arch-s3c2410/regs-udc.h b/include/asm-arm/arch-s3c2410/regs-udc.h index 3aa31a27da1ad..487861d5b49a9 100644 --- a/include/asm-arm/arch-s3c2410/regs-udc.h +++ b/include/asm-arm/arch-s3c2410/regs-udc.h @@ -1,4 +1,4 @@ -/* linux/include/asm/arch-s3c2410/regs-udc.h +/* linux/include/asm-arm/arch-s3c2410/regs-udc.h * * Copyright (C) 2004 Herbert Poetzl <herbert@13thfloor.at> * diff --git a/include/asm-arm/arch-s3c2410/spi-gpio.h b/include/asm-arm/arch-s3c2410/spi-gpio.h index 258c00bca2706..c1e4db7c97103 100644 --- a/include/asm-arm/arch-s3c2410/spi-gpio.h +++ b/include/asm-arm/arch-s3c2410/spi-gpio.h @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-s3c2410/spi.h +/* linux/include/asm-arm/arch-s3c2410/spi-gpio.h * * Copyright (c) 2006 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/include/asm-arm/arch-sa1100/neponset.h b/include/asm-arm/arch-sa1100/neponset.h index 8051fd73a80bc..09ec9e2bd1820 100644 --- a/include/asm-arm/arch-sa1100/neponset.h +++ b/include/asm-arm/arch-sa1100/neponset.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/assabet.h + * linux/include/asm-arm/arch-sa1100/neponset.h * * Created 2000/06/05 by Nicolas Pitre <nico@cam.org> * diff --git a/include/asm-arm/arch-sa1100/uncompress.h b/include/asm-arm/arch-sa1100/uncompress.h index 2601a77a6ddae..17e64d232e7df 100644 --- a/include/asm-arm/arch-sa1100/uncompress.h +++ b/include/asm-arm/arch-sa1100/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-brutus/uncompress.h + * linux/include/asm-arm/arch-sa1100/uncompress.h * * (C) 1999 Nicolas Pitre <nico@cam.org> * diff --git a/include/asm-arm/arch-shark/vmalloc.h b/include/asm-arm/arch-shark/vmalloc.h index 10db5d188231b..fac37c636b38f 100644 --- a/include/asm-arm/arch-shark/vmalloc.h +++ b/include/asm-arm/arch-shark/vmalloc.h @@ -1,4 +1,4 @@ /* - * linux/include/asm-arm/arch-rpc/vmalloc.h + * linux/include/asm-arm/arch-shark/vmalloc.h */ #define VMALLOC_END (PAGE_OFFSET + 0x10000000) diff --git a/include/asm-arm/hardware/debug-8250.S b/include/asm-arm/hardware/debug-8250.S index 4594fea91ec1c..07c97fb233fcd 100644 --- a/include/asm-arm/hardware/debug-8250.S +++ b/include/asm-arm/hardware/debug-8250.S @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/debug-8250.h + * linux/include/asm-arm/hardware/debug-8250.S * * Copyright (C) 1994-1999 Russell King * diff --git a/include/asm-arm/hardware/debug-pl01x.S b/include/asm-arm/hardware/debug-pl01x.S index db0d0f7de5e9c..23c541a9e89ab 100644 --- a/include/asm-arm/hardware/debug-pl01x.S +++ b/include/asm-arm/hardware/debug-pl01x.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-integrator/debug-macro.S +/* linux/include/asm-arm/hardware/debug-pl01x.S * * Debugging macro include header * diff --git a/include/asm-arm/hardware/entry-macro-iomd.S b/include/asm-arm/hardware/entry-macro-iomd.S index 30c7b92c24164..fbed08f298d07 100644 --- a/include/asm-arm/hardware/entry-macro-iomd.S +++ b/include/asm-arm/hardware/entry-macro-iomd.S @@ -1,5 +1,5 @@ /* - * arch/arm/commond/entry-macro-iomd.S + * include/asm-arm/hardware/entry-macro-iomd.S * * Low-level IRQ helper macros for IOC/IOMD based platforms * diff --git a/include/asm-arm/hardware/sa1111.h b/include/asm-arm/hardware/sa1111.h index 319aea064c367..6aa0a5b75b69d 100644 --- a/include/asm-arm/hardware/sa1111.h +++ b/include/asm-arm/hardware/sa1111.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/hardware/SA-1111.h + * linux/include/asm-arm/hardware/sa1111.h * * Copyright (C) 2000 John G Dorsey <john+@cs.cmu.edu> * diff --git a/include/asm-arm/timeofday.h b/include/asm-arm/timeofday.h deleted file mode 100644 index 27254bd5b94fd..0000000000000 --- a/include/asm-arm/timeofday.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _ASM_ARM_TIMEOFDAY_H -#define _ASM_ARM_TIMEOFDAY_H -#include <asm-generic/timeofday.h> -#endif diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h index 2ab4078334bf1..14a87eec5a2dd 100644 --- a/include/asm-arm/unistd.h +++ b/include/asm-arm/unistd.h @@ -549,30 +549,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 #define __ARCH_WANT_SYS_SOCKETCALL #endif -#ifdef __KERNEL_SYSCALLS__ - -#include <linux/compiler.h> -#include <linux/types.h> -#include <linux/syscalls.h> - -extern long execve(const char *file, char **argv, char **envp); - -struct pt_regs; -asmlinkage int sys_execve(char *filenamei, char **argv, char **envp, - struct pt_regs *regs); -asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, - struct pt_regs *regs); -asmlinkage int sys_fork(struct pt_regs *regs); -asmlinkage int sys_vfork(struct pt_regs *regs); -asmlinkage int sys_pipe(unsigned long *fildes); -struct sigaction; -asmlinkage long sys_rt_sigaction(int sig, - const struct sigaction __user *act, - struct sigaction __user *oact, - size_t sigsetsize); - -#endif /* __KERNEL_SYSCALLS__ */ - /* * "Conditional" syscalls * |