diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pci_regs.h | 1 | ||||
-rw-r--r-- | include/linux/pmu.h | 8 | ||||
-rw-r--r-- | include/linux/syscalls.h | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h index e2a089b051ed..d27a78b71297 100644 --- a/include/linux/pci_regs.h +++ b/include/linux/pci_regs.h | |||
@@ -196,6 +196,7 @@ | |||
196 | #define PCI_CAP_ID_MSI 0x05 /* Message Signalled Interrupts */ | 196 | #define PCI_CAP_ID_MSI 0x05 /* Message Signalled Interrupts */ |
197 | #define PCI_CAP_ID_CHSWP 0x06 /* CompactPCI HotSwap */ | 197 | #define PCI_CAP_ID_CHSWP 0x06 /* CompactPCI HotSwap */ |
198 | #define PCI_CAP_ID_PCIX 0x07 /* PCI-X */ | 198 | #define PCI_CAP_ID_PCIX 0x07 /* PCI-X */ |
199 | #define PCI_CAP_ID_HT_IRQCONF 0x08 /* HyperTransport IRQ Configuration */ | ||
199 | #define PCI_CAP_ID_SHPC 0x0C /* PCI Standard Hot-Plug Controller */ | 200 | #define PCI_CAP_ID_SHPC 0x0C /* PCI Standard Hot-Plug Controller */ |
200 | #define PCI_CAP_ID_EXP 0x10 /* PCI Express */ | 201 | #define PCI_CAP_ID_EXP 0x10 /* PCI Express */ |
201 | #define PCI_CAP_ID_MSIX 0x11 /* MSI-X */ | 202 | #define PCI_CAP_ID_MSIX 0x11 /* MSI-X */ |
diff --git a/include/linux/pmu.h b/include/linux/pmu.h index 373bd3b9b330..217d3daf7336 100644 --- a/include/linux/pmu.h +++ b/include/linux/pmu.h | |||
@@ -140,7 +140,7 @@ extern int find_via_pmu(void); | |||
140 | 140 | ||
141 | extern int pmu_request(struct adb_request *req, | 141 | extern int pmu_request(struct adb_request *req, |
142 | void (*done)(struct adb_request *), int nbytes, ...); | 142 | void (*done)(struct adb_request *), int nbytes, ...); |
143 | 143 | extern int pmu_queue_request(struct adb_request *req); | |
144 | extern void pmu_poll(void); | 144 | extern void pmu_poll(void); |
145 | extern void pmu_poll_adb(void); /* For use by xmon */ | 145 | extern void pmu_poll_adb(void); /* For use by xmon */ |
146 | extern void pmu_wait_complete(struct adb_request *req); | 146 | extern void pmu_wait_complete(struct adb_request *req); |
@@ -160,12 +160,6 @@ extern void pmu_unlock(void); | |||
160 | extern int pmu_present(void); | 160 | extern int pmu_present(void); |
161 | extern int pmu_get_model(void); | 161 | extern int pmu_get_model(void); |
162 | 162 | ||
163 | extern int pmu_i2c_combined_read(int bus, int addr, int subaddr, u8* data, int len); | ||
164 | extern int pmu_i2c_stdsub_write(int bus, int addr, int subaddr, u8* data, int len); | ||
165 | extern int pmu_i2c_simple_read(int bus, int addr, u8* data, int len); | ||
166 | extern int pmu_i2c_simple_write(int bus, int addr, u8* data, int len); | ||
167 | |||
168 | |||
169 | #ifdef CONFIG_PM | 163 | #ifdef CONFIG_PM |
170 | /* | 164 | /* |
171 | * Stuff for putting the powerbook to sleep and waking it again. | 165 | * Stuff for putting the powerbook to sleep and waking it again. |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index e910d1a481df..3eed47347013 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -514,4 +514,9 @@ asmlinkage long sys_set_mempolicy(int mode, unsigned long __user *nmask, | |||
514 | asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode, | 514 | asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode, |
515 | const unsigned long __user *from, const unsigned long __user *to); | 515 | const unsigned long __user *from, const unsigned long __user *to); |
516 | 516 | ||
517 | asmlinkage long sys_spu_run(int fd, __u32 __user *unpc, | ||
518 | __u32 __user *ustatus); | ||
519 | asmlinkage long sys_spu_create(const char __user *name, | ||
520 | unsigned int flags, mode_t mode); | ||
521 | |||
517 | #endif | 522 | #endif |