diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 16:45:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 16:45:41 -0400 |
| commit | 37b0d1dedcedf555e2940bc7702c11e2b572299f (patch) | |
| tree | ce0b69ccd8f147d5eb7c4d75d45dbb67b4a4ff0a /include | |
| parent | d374c1c1281d6188a0d0676172b1c0e3de35c6e7 (diff) | |
| parent | 56f1319e877a969b814b3805c77ea9c31d849f54 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix Integrator and Versatile interrupt initialisation
[ARM] 3546/1: PATCH: subtle lost interrupts bug on i.MX
[ARM] 3547/1: PXA-OHCI: Allow platforms to specify a power budget
[ARM] Fix Neponset IRQ handling
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-pxa/ohci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/ohci.h b/include/asm-arm/arch-pxa/ohci.h index 7da89569061e..e848a47128cd 100644 --- a/include/asm-arm/arch-pxa/ohci.h +++ b/include/asm-arm/arch-pxa/ohci.h | |||
| @@ -11,6 +11,8 @@ struct pxaohci_platform_data { | |||
| 11 | #define PMM_NPS_MODE 1 | 11 | #define PMM_NPS_MODE 1 |
| 12 | #define PMM_GLOBAL_MODE 2 | 12 | #define PMM_GLOBAL_MODE 2 |
| 13 | #define PMM_PERPORT_MODE 3 | 13 | #define PMM_PERPORT_MODE 3 |
| 14 | |||
| 15 | int power_budget; | ||
| 14 | }; | 16 | }; |
| 15 | 17 | ||
| 16 | extern void pxa_set_ohci_info(struct pxaohci_platform_data *info); | 18 | extern void pxa_set_ohci_info(struct pxaohci_platform_data *info); |