diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/input/touchscreen/atmel-wm97xx.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/input/touchscreen/atmel-wm97xx.c')
| -rw-r--r-- | drivers/input/touchscreen/atmel-wm97xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/atmel-wm97xx.c b/drivers/input/touchscreen/atmel-wm97xx.c index 35377f583e28..a12242f77e23 100644 --- a/drivers/input/touchscreen/atmel-wm97xx.c +++ b/drivers/input/touchscreen/atmel-wm97xx.c | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | #define ATMEL_WM97XX_AC97C_IRQ (29) | 59 | #define ATMEL_WM97XX_AC97C_IRQ (29) |
| 60 | #define ATMEL_WM97XX_GPIO_DEFAULT (32+16) /* Pin 16 on port B. */ | 60 | #define ATMEL_WM97XX_GPIO_DEFAULT (32+16) /* Pin 16 on port B. */ |
| 61 | #else | 61 | #else |
| 62 | #error Unkown CPU, this driver only supports AT32AP700X CPUs. | 62 | #error Unknown CPU, this driver only supports AT32AP700X CPUs. |
| 63 | #endif | 63 | #endif |
| 64 | 64 | ||
| 65 | struct continuous { | 65 | struct continuous { |