diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
| commit | 8b3f6af86378d0a10ca2f1ded1da124aef13b62c (patch) | |
| tree | de6ca90295730343c495be8d98be8efa322140ef /arch/arm/mach-kirkwood/include/mach/kirkwood.h | |
| parent | 139d6065c83071d5f66cd013a274a43699f8e2c1 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpc-usb/TODO
drivers/staging/cpc-usb/cpc-usb_drv.c
drivers/staging/cpc-usb/cpc.h
drivers/staging/cpc-usb/cpc_int.h
drivers/staging/cpc-usb/cpcusb.h
Diffstat (limited to 'arch/arm/mach-kirkwood/include/mach/kirkwood.h')
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/kirkwood.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h index 07af858814a0..54c132731d2d 100644 --- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h +++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h | |||
| @@ -101,6 +101,7 @@ | |||
| 101 | #define MV88F6281_DEV_ID 0x6281 | 101 | #define MV88F6281_DEV_ID 0x6281 |
| 102 | #define MV88F6281_REV_Z0 0 | 102 | #define MV88F6281_REV_Z0 0 |
| 103 | #define MV88F6281_REV_A0 2 | 103 | #define MV88F6281_REV_A0 2 |
| 104 | #define MV88F6281_REV_A1 3 | ||
| 104 | 105 | ||
| 105 | #define MV88F6192_DEV_ID 0x6192 | 106 | #define MV88F6192_DEV_ID 0x6192 |
| 106 | #define MV88F6192_REV_Z0 0 | 107 | #define MV88F6192_REV_Z0 0 |