Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux
* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux: ARM: S3C: Fix NAND device registration by s3c_nand_set_platdata(). ARM: S3C24XX: touchscreen device definition ARM: mach-bast: add NAND_SCAN_SILENT_NODEV to optional devices ARM: mach-osiris: add NAND_SCAN_SILENT_NODEV to optional devices ARM: S3C24XX: touchscreen device definition
No related branches found
No related tags found
Showing
- arch/arm/mach-s3c2410/include/mach/ts.h 21 additions, 0 deletionsarch/arm/mach-s3c2410/include/mach/ts.h
- arch/arm/mach-s3c2410/mach-bast.c 3 additions, 0 deletionsarch/arm/mach-s3c2410/mach-bast.c
- arch/arm/mach-s3c2410/mach-h1940.c 8 additions, 0 deletionsarch/arm/mach-s3c2410/mach-h1940.c
- arch/arm/mach-s3c2440/mach-osiris.c 2 additions, 0 deletionsarch/arm/mach-s3c2440/mach-osiris.c
- arch/arm/plat-s3c/dev-nand.c 3 additions, 1 deletionarch/arm/plat-s3c/dev-nand.c
- arch/arm/plat-s3c/include/plat/devs.h 1 addition, 0 deletionsarch/arm/plat-s3c/include/plat/devs.h
- arch/arm/plat-s3c24xx/devs.c 18 additions, 0 deletionsarch/arm/plat-s3c24xx/devs.c
- arch/arm/plat-s3c24xx/s3c244x.c 1 addition, 0 deletionsarch/arm/plat-s3c24xx/s3c244x.c
Loading
Please register or sign in to comment