1. 22 Aug, 2011 5 commits
  2. 18 Aug, 2011 3 commits
  3. 17 Aug, 2011 6 commits
  4. 16 Aug, 2011 5 commits
  5. 15 Aug, 2011 18 commits
  6. 14 Aug, 2011 3 commits
    • Mark Brown's avatar
      Merge branch 'for-3.1' into for-3.2 · b21a415d
      Mark Brown authored
      b21a415d
    • Vasily Khoruzhick's avatar
      ASoC: rx1950: Fix compilation error due to missing header · b8487928
      Vasily Khoruzhick authored
      Add linux/types.h to fix this compilation error:
      
      In file included from arch/arm/mach-s3c2410/include/mach/gpio-fns.h:27:0,
                       from arch/arm/mach-s3c2410/include/mach/gpio.h:27,
                       from /home/anarsoul/work/pda-linux/linux-next/arch/arm/include/asm/gpio.h:5,
                       from include/linux/gpio.h:18,
                       from sound/soc/samsung/rx1950_uda1380.c:20:
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:29:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_pull_t’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:30:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_drvstr_t’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:57:2: error: expected specifier-qualifier-list before ‘s3c_gpio_pull_t’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:148:47: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:156:24: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_getpull’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:175:24: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h: In function ‘s3c_gpio_cfgrange_nopull’:
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: ‘s3c_gpio_pull_t’ undeclared (first use in this function)
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: note: each undeclared identifier is reported only once for each function it appears in
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: expected ‘)’ before numeric constant
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: too many arguments to function ‘s3c_gpio_cfgall_range’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:174:12: note: declared here
      arch/arm/plat-samsung/include/plat/gpio-cfg.h: At top level:
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:199:26: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_get_drvstr’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:210:50: error: expected declaration specifiers or ‘...’ before ‘s5p_gpio_drvstr_t’
      Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
      Acked-by: default avatarJassi Brar <jassisinghbrar@gmail.com>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      b8487928
    • Vasily Khoruzhick's avatar
      ASoC: h1940: Fix compilation error due to missing header · fd049755
      Vasily Khoruzhick authored
      Add linux/types.h to fix this compilation error:
      
      In file included from arch/arm/mach-s3c2410/include/mach/gpio-fns.h:27:0,
                       from arch/arm/mach-s3c2410/include/mach/gpio.h:27,
                       from /home/anarsoul/work/pda-linux/linux-next/arch/arm/include/asm/gpio.h:5,
                       from include/linux/gpio.h:18,
                       from sound/soc/samsung/rx1950_uda1380.c:20:
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:29:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_pull_t’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:30:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_drvstr_t’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:57:2: error: expected specifier-qualifier-list before ‘s3c_gpio_pull_t’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:148:47: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:156:24: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_getpull’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:175:24: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h: In function ‘s3c_gpio_cfgrange_nopull’:
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: ‘s3c_gpio_pull_t’ undeclared (first use in this function)
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: note: each undeclared identifier is reported only once for each function it appears in
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: expected ‘)’ before numeric constant
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: too many arguments to function ‘s3c_gpio_cfgall_range’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:174:12: note: declared here
      arch/arm/plat-samsung/include/plat/gpio-cfg.h: At top level:
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:199:26: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_get_drvstr’
      arch/arm/plat-samsung/include/plat/gpio-cfg.h:210:50: error: expected declaration specifiers or ‘...’ before ‘s5p_gpio_drvstr_t’
      Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
      Acked-by: default avatarJassi Brar <jassisinghbrar@gmail.com>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      fd049755