diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 02:18:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 02:18:01 -0500 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/mtd/rfd_ftl.c | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/mtd/rfd_ftl.c')
| -rw-r--r-- | drivers/mtd/rfd_ftl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c index 0ab8d29caeea..20ce212638fc 100644 --- a/drivers/mtd/rfd_ftl.c +++ b/drivers/mtd/rfd_ftl.c | |||
| @@ -30,11 +30,9 @@ MODULE_PARM_DESC(block_size, "Block size to use by RFD, defaults to erase unit s | |||
| 30 | 30 | ||
| 31 | #define PREFIX "rfd_ftl: " | 31 | #define PREFIX "rfd_ftl: " |
| 32 | 32 | ||
| 33 | /* Major device # for FTL device */ | 33 | /* This major has been assigned by device@lanana.org */ |
| 34 | |||
| 35 | /* A request for this major has been sent to device@lanana.org */ | ||
| 36 | #ifndef RFD_FTL_MAJOR | 34 | #ifndef RFD_FTL_MAJOR |
| 37 | #define RFD_FTL_MAJOR 95 | 35 | #define RFD_FTL_MAJOR 256 |
| 38 | #endif | 36 | #endif |
| 39 | 37 | ||
| 40 | /* Maximum number of partitions in an FTL region */ | 38 | /* Maximum number of partitions in an FTL region */ |