diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 10:06:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 10:06:54 -0700 |
| commit | e77277dfe28baed73b6fd7c66c3fb44580a3dac1 (patch) | |
| tree | 0c40be7a4ca9140d86122ed9057fe1573ea91b2d /arch/arm/mach-s3c2410/include/mach/h1940.h | |
| parent | 75ea6358bc7d97630a8edc2b89c930de118cf7eb (diff) | |
| parent | 9edb240696bacd53f4331119d2dfd13d4cd4852f (diff) | |
| download | op-kernel-dev-e77277dfe28baed73b6fd7c66c3fb44580a3dac1.zip op-kernel-dev-e77277dfe28baed73b6fd7c66c3fb44580a3dac1.tar.gz | |
Merge branch 'next-samsung' of git://git.fluff.org/bjdooks/linux
* 'next-samsung' of git://git.fluff.org/bjdooks/linux:
ARM: H1940/RX1950: Change default LED triggers
ARM: S3C2442: RX1950: Add support for LED blinking
ARM: S3C2442: RX1950: Retain LEDs state in suspend
ARM: S3C2410: H1940: Fix lcd_power_set function
ARM: S3C2410: H1940: Add battery support
ARM: S3C2410: H1940: Use leds-gpio driver for LEDs managing
ARM: S3C2410: H1940: Make h1940-bluetooth.c compile again
ARM: S3C2410: H1940: Add keys device
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach/h1940.h')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/h1940.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/h1940.h b/arch/arm/mach-s3c2410/include/mach/h1940.h index 4559784..2aa683c 100644 --- a/arch/arm/mach-s3c2410/include/mach/h1940.h +++ b/arch/arm/mach-s3c2410/include/mach/h1940.h @@ -17,5 +17,8 @@ #define H1940_SUSPEND_CHECK (0x30080000) extern void h1940_pm_return(void); +extern int h1940_led_blink_set(unsigned gpio, int state, + unsigned long *delay_on, unsigned long *delay_off); + #endif /* __ASM_ARCH_H1940_H */ |
