diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /arch/arm/mach-mmp/include/mach/pxa168.h | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/pxa168.h')
-rw-r--r-- | arch/arm/mach-mmp/include/mach/pxa168.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h index 37632d964d5..7f005843a70 100644 --- a/arch/arm/mach-mmp/include/mach/pxa168.h +++ b/arch/arm/mach-mmp/include/mach/pxa168.h | |||
@@ -5,18 +5,16 @@ struct sys_timer; | |||
5 | 5 | ||
6 | extern struct sys_timer pxa168_timer; | 6 | extern struct sys_timer pxa168_timer; |
7 | extern void __init pxa168_init_irq(void); | 7 | extern void __init pxa168_init_irq(void); |
8 | extern void pxa168_restart(char, const char *); | ||
9 | extern void pxa168_clear_keypad_wakeup(void); | 8 | extern void pxa168_clear_keypad_wakeup(void); |
10 | 9 | ||
11 | #include <linux/i2c.h> | 10 | #include <linux/i2c.h> |
12 | #include <linux/i2c/pxa-i2c.h> | 11 | #include <linux/i2c/pxa-i2c.h> |
13 | #include <mach/devices.h> | 12 | #include <mach/devices.h> |
14 | #include <linux/platform_data/mtd-nand-pxa3xx.h> | 13 | #include <plat/pxa3xx_nand.h> |
15 | #include <video/pxa168fb.h> | 14 | #include <video/pxa168fb.h> |
16 | #include <linux/platform_data/keypad-pxa27x.h> | 15 | #include <plat/pxa27x_keypad.h> |
17 | #include <mach/cputype.h> | 16 | #include <mach/cputype.h> |
18 | #include <linux/pxa168_eth.h> | 17 | #include <linux/pxa168_eth.h> |
19 | #include <linux/platform_data/mv_usb.h> | ||
20 | 18 | ||
21 | extern struct pxa_device_desc pxa168_device_uart1; | 19 | extern struct pxa_device_desc pxa168_device_uart1; |
22 | extern struct pxa_device_desc pxa168_device_uart2; | 20 | extern struct pxa_device_desc pxa168_device_uart2; |
@@ -37,12 +35,6 @@ extern struct pxa_device_desc pxa168_device_fb; | |||
37 | extern struct pxa_device_desc pxa168_device_keypad; | 35 | extern struct pxa_device_desc pxa168_device_keypad; |
38 | extern struct pxa_device_desc pxa168_device_eth; | 36 | extern struct pxa_device_desc pxa168_device_eth; |
39 | 37 | ||
40 | /* pdata can be NULL */ | ||
41 | extern int __init pxa168_add_usb_host(struct mv_usb_platform_data *pdata); | ||
42 | |||
43 | |||
44 | extern struct platform_device pxa168_device_gpio; | ||
45 | |||
46 | static inline int pxa168_add_uart(int id) | 38 | static inline int pxa168_add_uart(int id) |
47 | { | 39 | { |
48 | struct pxa_device_desc *d = NULL; | 40 | struct pxa_device_desc *d = NULL; |