On Monday, June 17, 2013 03:10:27 PM Arnd Bergmann wrote:

On Sunday 05 May 2013 23:04:07 Chao Xie wrote:

quoted

Now pxa27x-keypad make use matrix_keymap for matrix keyes, so
remove the unused members in platform data.

Signed-off-by: Chao Xie <redacted>
---

 include/linux/platform_data/keypad-pxa27x.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/include/linux/platform_data/keypad-pxa27x.h

b/include/linux/platform_data/keypad-pxa27x.h index 0db423b..2462556
100644

--- a/include/linux/platform_data/keypad-pxa27x.h
+++ b/include/linux/platform_data/keypad-pxa27x.h

@@ -39,8 +39,6 @@ struct pxa27x_keypad_platform_data {

        const struct matrix_keymap_data *matrix_keymap_data;
        unsigned int    matrix_key_rows;
        unsigned int    matrix_key_cols;

-       unsigned int    *matrix_key_map;
-       int             matrix_key_map_size;

        /* direct keys */
        int             direct_key_num;

This just broke a number of configurations:

em_x270_defconfig
ezx_defconfig
palmz72_defconfig
pxa3xx_defconfig

You have to make sure that all these board files get converted:

arch/arm/mach-pxa/em-x270.c
arch/arm/mach-pxa/ezx.c
arch/arm/mach-pxa/littleton.c
arch/arm/mach-pxa/mainstone.c
arch/arm/mach-pxa/mioa701.c
arch/arm/mach-pxa/palmld.c
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmtreo.c
arch/arm/mach-pxa/palmtx.c
arch/arm/mach-pxa/palmz72.c
arch/arm/mach-pxa/tavorevb.c
arch/arm/mach-pxa/z2.c
arch/arm/mach-pxa/zylonite.c

or leave the code to interpret that platform data in place.

Sorry about this, I'll drop the patch until it gets sorted out.

Thanks.

-- 
Dmitry