diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-29 00:35:13 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-29 00:35:13 +0400 |
| commit | b53471711f21ba0e151075f0e1d6d531eb50f1b1 (patch) | |
| tree | e912dbe14b6af76b0ebe853a9976c99616bb8a4c /arch/ppc/syslib/pq2_sys.c | |
| parent | 983f27d37d4fc72c252835cb2ee3103b360735a6 (diff) | |
| parent | 83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b (diff) | |
| download | linux-b53471711f21ba0e151075f0e1d6d531eb50f1b1.tar.xz | |
Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream
Diffstat (limited to 'arch/ppc/syslib/pq2_sys.c')
| -rw-r--r-- | arch/ppc/syslib/pq2_sys.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/syslib/pq2_sys.c b/arch/ppc/syslib/pq2_sys.c index 433b0fa203e1..fee8948162b9 100644 --- a/arch/ppc/syslib/pq2_sys.c +++ b/arch/ppc/syslib/pq2_sys.c @@ -139,13 +139,13 @@ struct ppc_sys_spec ppc_sys_specs[] = { .ppc_sys_name = "8272", .mask = 0x0000ff00, .value = 0x00000c00, - .num_devices = 11, + .num_devices = 12, .device_list = (enum ppc_sys_devices[]) { MPC82xx_CPM_FCC1, MPC82xx_CPM_FCC2, MPC82xx_CPM_SCC1, - MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SMC1, - MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, MPC82xx_CPM_I2C, - MPC82xx_CPM_USB, MPC82xx_SEC1, + MPC82xx_CPM_SCC2, MPC82xx_CPM_SCC3, MPC82xx_CPM_SCC4, + MPC82xx_CPM_SMC1, MPC82xx_CPM_SMC2, MPC82xx_CPM_SPI, + MPC82xx_CPM_I2C, MPC82xx_CPM_USB, MPC82xx_SEC1, }, }, /* below is a list of the 8280 family of processors */ |