diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
| commit | eda3d8f5604860aae1bb9996bb5efc4213778369 (patch) | |
| tree | 9d3887d2665bcc5f5abf200758794545c7b2c69b /include/asm-sparc/machines.h | |
| parent | 87a9f704658a40940e740b1d73d861667e9164d3 (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'include/asm-sparc/machines.h')
| -rw-r--r-- | include/asm-sparc/machines.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sparc/machines.h b/include/asm-sparc/machines.h index d6c6bf836206..c28c2f248794 100644 --- a/include/asm-sparc/machines.h +++ b/include/asm-sparc/machines.h | |||
| @@ -17,8 +17,6 @@ struct Sun_Machine_Models { | |||
| 17 | */ | 17 | */ |
| 18 | #define NUM_SUN_MACHINES 15 | 18 | #define NUM_SUN_MACHINES 15 |
| 19 | 19 | ||
| 20 | extern struct Sun_Machine_Models Sun_Machines[NUM_SUN_MACHINES]; | ||
| 21 | |||
| 22 | /* The machine type in the idprom area looks like this: | 20 | /* The machine type in the idprom area looks like this: |
| 23 | * | 21 | * |
| 24 | * --------------- | 22 | * --------------- |