diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-05-01 08:29:55 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-05-01 08:29:55 -0400 |
| commit | 0b7877d4eea3f93e3dd941999522bbd8c538cb53 (patch) | |
| tree | ade6d4e411b9b9b569c802e3b2179826162c934c /include/linux/platform_data | |
| parent | bd1a68b59c8e3bce45fb76632c64e1e063c3962d (diff) | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
Merge tag 'v3.4-rc5' into for-3.5/core
The core branch is behind driver commits that we want to build
on for 3.5, hence I'm pulling in a later -rc.
Linux 3.4-rc5
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Jens Axboe <axboe@kernel.dk>
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__ */ |