mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
This commit is contained in:
commit
33052057e3
271 changed files with 9399 additions and 8793 deletions
|
|
@ -435,7 +435,7 @@ extern int sbf_port ;
|
|||
|
||||
#endif /* !CONFIG_ACPI */
|
||||
|
||||
int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
|
||||
int acpi_register_gsi (u32 gsi, int triggering, int polarity);
|
||||
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -185,6 +185,7 @@ extern enum system_states {
|
|||
SYSTEM_HALT,
|
||||
SYSTEM_POWER_OFF,
|
||||
SYSTEM_RESTART,
|
||||
SYSTEM_SUSPEND_DISK,
|
||||
} system_state;
|
||||
|
||||
#define TAINT_PROPRIETARY_MODULE (1<<0)
|
||||
|
|
|
|||
|
|
@ -60,8 +60,7 @@ extern void machine_crash_shutdown(struct pt_regs *);
|
|||
*/
|
||||
|
||||
extern void kernel_restart_prepare(char *cmd);
|
||||
extern void kernel_halt_prepare(void);
|
||||
extern void kernel_power_off_prepare(void);
|
||||
extern void kernel_shutdown_prepare(enum system_states state);
|
||||
|
||||
extern void kernel_restart(char *cmd);
|
||||
extern void kernel_halt(void);
|
||||
|
|
|
|||
|
|
@ -559,12 +559,12 @@ asmlinkage long sys_newfstatat(int dfd, char __user *filename,
|
|||
struct stat __user *statbuf, int flag);
|
||||
asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *buf,
|
||||
int bufsiz);
|
||||
asmlinkage long compat_sys_futimesat(int dfd, char __user *filename,
|
||||
asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename,
|
||||
struct compat_timeval __user *t);
|
||||
asmlinkage long compat_sys_newfstatat(int dfd, char __user * filename,
|
||||
asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename,
|
||||
struct compat_stat __user *statbuf,
|
||||
int flag);
|
||||
asmlinkage long compat_sys_openat(int dfd, const char __user *filename,
|
||||
asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename,
|
||||
int flags, int mode);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue