Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 355102
b: refs/heads/master
c: eea6e39
h: refs/heads/master
v: v3
  • Loading branch information
Marko Katic authored and Haojian Zhuang committed Jan 23, 2013
1 parent 4045761 commit 21aa337
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d107a204154ddd79339203c2deeb7433f0cf6777
refs/heads/master: eea6e39b916dd282c7fa4629be8934b5ad60e62b
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-pxa/spitz.c
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ static inline void spitz_lcd_init(void) {}
#endif

/******************************************************************************
* Framebuffer
* NAND Flash
******************************************************************************/
#if defined(CONFIG_MTD_NAND_SHARPSL) || defined(CONFIG_MTD_NAND_SHARPSL_MODULE)
static struct mtd_partition spitz_nand_partitions[] = {
Expand Down Expand Up @@ -858,7 +858,7 @@ static inline void spitz_nor_init(void) {}
#endif

/******************************************************************************
* GPIO expander
* I2C devices
******************************************************************************/
#if defined(CONFIG_I2C_PXA) || defined(CONFIG_I2C_PXA_MODULE)
static struct pca953x_platform_data akita_pca953x_pdata = {
Expand Down

0 comments on commit 21aa337

Please sign in to comment.