diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-27 00:27:10 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-27 00:27:10 -0700 |
| commit | 993808253ca256b8ca7f8ff90d9935d7c99cd32d (patch) | |
| tree | ff51c2b3f7625ae8d89b45962cc3dbc59a5152f8 /arch | |
| parent | 10ce3cc919f50c2043b41ca968b43c26a3672600 (diff) | |
| parent | 131c713fd96e251fcb18f4d2d05f263aa41bb11f (diff) | |
Merge branch 'next' into for-linus
Conflicts:
drivers/input/tablet/wacom_sys.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-spear/include/plat/keyboard.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/plat-spear/include/plat/keyboard.h b/arch/arm/plat-spear/include/plat/keyboard.h index c16cc31ecbed..0562f134621d 100644 --- a/arch/arm/plat-spear/include/plat/keyboard.h +++ b/arch/arm/plat-spear/include/plat/keyboard.h @@ -159,11 +159,4 @@ struct kbd_platform_data { unsigned int mode; }; -/* This function is used to set platform data field of pdev->dev */ -static inline void -kbd_set_plat_data(struct platform_device *pdev, struct kbd_platform_data *data) -{ - pdev->dev.platform_data = data; -} - #endif /* __PLAT_KEYBOARD_H */ |