diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-21 06:45:18 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-21 06:45:18 -0400 |
| commit | 775b2449bdba7c97dda9f274c92bf7a83dac4142 (patch) | |
| tree | b4bee45c13762ea93642b1e38c62de454e51cf5d /include/linux/platform_data | |
| parent | 21363cf0ca5c9c62e34e37422fb1d13d70d3de3c (diff) | |
| parent | 5fb86e5d4a951ddb0474cdfd809380c8e2a8d101 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/atmel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index d056263545b1..b0f2c56a8ea2 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | * GPL v2 Only | 4 | * GPL v2 Only |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #ifndef __ATMEL_NAND_H__ | 7 | #ifndef __ATMEL_H__ |
| 8 | #define __ATMEL_NAND_H__ | 8 | #define __ATMEL_H__ |
| 9 | 9 | ||
| 10 | #include <linux/mtd/nand.h> | 10 | #include <linux/mtd/nand.h> |
| 11 | 11 | ||
| @@ -24,4 +24,4 @@ struct atmel_nand_data { | |||
| 24 | unsigned int num_parts; | 24 | unsigned int num_parts; |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | #endif /* __ATMEL_NAND_H__ */ | 27 | #endif /* __ATMEL_H__ */ |