diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 11:35:02 +0100 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 11:35:02 +0100 |
commit | 4b77b926aee4832bdb86b46fc5a7b0f2e4467225 (patch) | |
tree | ca6050d70f12549a54e47f980313bf7f18e1097e /arch/arm/mach-s3c2442/include/mach | |
parent | eb97ba7e3da8998565058aedd3d57c1859083271 (diff) | |
parent | efafd86ce0ed4494b150fd6b79965aaa65ff99dc (diff) |
Merge branch 'gta02-machine-2.6.32' into gta02-machine-devices-2.6.32
Conflicts:
arch/arm/mach-s3c2442/Kconfig
arch/arm/mach-s3c2442/Makefile
arch/arm/mach-s3c2442/mach-gta02.c
Diffstat (limited to 'arch/arm/mach-s3c2442/include/mach')
-rw-r--r-- | arch/arm/mach-s3c2442/include/mach/gta02-pm-gps.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c2442/include/mach/gta02-pm-wlan.h | 10 | ||||
-rw-r--r-- | arch/arm/mach-s3c2442/include/mach/gta02.h | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2442/include/mach/gta02-pm-gps.h b/arch/arm/mach-s3c2442/include/mach/gta02-pm-gps.h new file mode 100644 index 00000000000..f15180ac079 --- /dev/null +++ b/arch/arm/mach-s3c2442/include/mach/gta02-pm-gps.h @@ -0,0 +1 @@ +extern int gta02_pm_gps_is_on(void); diff --git a/arch/arm/mach-s3c2442/include/mach/gta02-pm-wlan.h b/arch/arm/mach-s3c2442/include/mach/gta02-pm-wlan.h new file mode 100644 index 00000000000..48369789709 --- /dev/null +++ b/arch/arm/mach-s3c2442/include/mach/gta02-pm-wlan.h @@ -0,0 +1,10 @@ +#ifndef __MACH_GTA02_PM_WLAN_H +#define __MACH_GTA02_PM_WLAN_H + +void gta02_wlan_reset(int assert_reset); +int gta02_wlan_query_rfkill_lock(void); +void gta02_wlan_query_rfkill_unlock(void); +void gta02_wlan_set_rfkill_cb(int (*cb)(void *user, int on), void *user); +void gta02_wlan_clear_rfkill_cb(void); + +#endif /* __MACH_GTA02_PM_WLAN_H */ diff --git a/arch/arm/mach-s3c2442/include/mach/gta02.h b/arch/arm/mach-s3c2442/include/mach/gta02.h index 43310a3c199..b67e5ec2919 100644 --- a/arch/arm/mach-s3c2442/include/mach/gta02.h +++ b/arch/arm/mach-s3c2442/include/mach/gta02.h @@ -2,6 +2,7 @@ #define _GTA02_H #include <mach/regs-gpio.h> +#include <mach/regs-gpioj.h> /* Different hardware revisions, passed in ATAG_REVISION by u-boot */ #define GTA02v1_SYSTEM_REV 0x00000310 @@ -84,4 +85,6 @@ int gta02_get_pcb_revision(void); +extern struct pcf50633 *gta02_pcf; + #endif /* _GTA02_H */ |