diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /drivers/ide/ide-disk.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/ide/ide-disk.c')
| -rw-r--r-- | drivers/ide/ide-disk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index aed8b31ca561..8f5bed471050 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -397,6 +397,7 @@ static inline int idedisk_supports_lba48(const struct hd_driveid *id) | |||
| 397 | static const struct drive_list_entry hpa_list[] = { | 397 | static const struct drive_list_entry hpa_list[] = { |
| 398 | { "ST340823A", NULL }, | 398 | { "ST340823A", NULL }, |
| 399 | { "ST320413A", NULL }, | 399 | { "ST320413A", NULL }, |
| 400 | { "ST310211A", NULL }, | ||
| 400 | { NULL, NULL } | 401 | { NULL, NULL } |
| 401 | }; | 402 | }; |
| 402 | 403 | ||