diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /include/asm-sparc | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/pci.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc/unistd.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h index 44bb38758c96..97052baf90c1 100644 --- a/include/asm-sparc/pci.h +++ b/include/asm-sparc/pci.h | |||
| @@ -20,7 +20,7 @@ extern inline void pcibios_set_master(struct pci_dev *dev) | |||
| 20 | /* No special bus mastering setup handling */ | 20 | /* No special bus mastering setup handling */ |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | extern inline void pcibios_penalize_isa_irq(int irq) | 23 | extern inline void pcibios_penalize_isa_irq(int irq, int active) |
| 24 | { | 24 | { |
| 25 | /* We don't do dynamic PCI IRQ allocation */ | 25 | /* We don't do dynamic PCI IRQ allocation */ |
| 26 | } | 26 | } |
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 846708403900..aee17d7e2e44 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
| @@ -212,7 +212,7 @@ | |||
| 212 | #define __NR_epoll_create 193 /* Linux Specific */ | 212 | #define __NR_epoll_create 193 /* Linux Specific */ |
| 213 | #define __NR_epoll_ctl 194 /* Linux Specific */ | 213 | #define __NR_epoll_ctl 194 /* Linux Specific */ |
| 214 | #define __NR_epoll_wait 195 /* Linux Specific */ | 214 | #define __NR_epoll_wait 195 /* Linux Specific */ |
| 215 | /* #define __NR_ulimit 196 Linux Specific */ | 215 | #define __NR_ioprio_set 196 /* Linux Specific */ |
| 216 | #define __NR_getppid 197 /* Linux Specific */ | 216 | #define __NR_getppid 197 /* Linux Specific */ |
| 217 | #define __NR_sigaction 198 /* Linux Specific */ | 217 | #define __NR_sigaction 198 /* Linux Specific */ |
| 218 | #define __NR_sgetmask 199 /* Linux Specific */ | 218 | #define __NR_sgetmask 199 /* Linux Specific */ |
| @@ -234,7 +234,7 @@ | |||
| 234 | #define __NR_ipc 215 /* Linux Specific */ | 234 | #define __NR_ipc 215 /* Linux Specific */ |
| 235 | #define __NR_sigreturn 216 /* Linux Specific */ | 235 | #define __NR_sigreturn 216 /* Linux Specific */ |
| 236 | #define __NR_clone 217 /* Linux Specific */ | 236 | #define __NR_clone 217 /* Linux Specific */ |
| 237 | /* #define __NR_modify_ldt 218 Linux Specific - i386 specific, unused */ | 237 | #define __NR_ioprio_get 218 /* Linux Specific */ |
| 238 | #define __NR_adjtimex 219 /* Linux Specific */ | 238 | #define __NR_adjtimex 219 /* Linux Specific */ |
| 239 | #define __NR_sigprocmask 220 /* Linux Specific */ | 239 | #define __NR_sigprocmask 220 /* Linux Specific */ |
| 240 | #define __NR_create_module 221 /* Linux Specific */ | 240 | #define __NR_create_module 221 /* Linux Specific */ |