mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6629/2: aaec2000: remove support for mach-aaec2000
ARM: lh7a40x: remove unmaintained platform support
Fix up trivial conflicts in
- arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed)
- drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added)
This commit is contained in:
commit
63a93699c6
76 changed files with 1 additions and 8400 deletions
|
|
@ -322,69 +322,6 @@ config FB_ARMCLCD
|
|||
here and read <file:Documentation/kbuild/modules.txt>. The module
|
||||
will be called amba-clcd.
|
||||
|
||||
choice
|
||||
|
||||
depends on FB_ARMCLCD && (ARCH_LH7A40X || ARCH_LH7952X)
|
||||
prompt "LCD Panel"
|
||||
default FB_ARMCLCD_SHARP_LQ035Q7DB02
|
||||
|
||||
config FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT
|
||||
bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC"
|
||||
help
|
||||
This is an implementation of the Sharp LQ035Q7DB02, a 3.5"
|
||||
color QVGA, HRTFT panel. The LogicPD device includes
|
||||
an integrated HRTFT controller IC.
|
||||
The native resolution is 240x320.
|
||||
|
||||
config FB_ARMCLCD_SHARP_LQ057Q3DC02
|
||||
bool "LogicPD LCD 5.7\" QVGA"
|
||||
help
|
||||
This is an implementation of the Sharp LQ057Q3DC02, a 5.7"
|
||||
color QVGA, TFT panel. The LogicPD device includes an
|
||||
The native resolution is 320x240.
|
||||
|
||||
config FB_ARMCLCD_SHARP_LQ64D343
|
||||
bool "LogicPD LCD 6.4\" VGA"
|
||||
help
|
||||
This is an implementation of the Sharp LQ64D343, a 6.4"
|
||||
color VGA, TFT panel. The LogicPD device includes an
|
||||
The native resolution is 640x480.
|
||||
|
||||
config FB_ARMCLCD_SHARP_LQ10D368
|
||||
bool "LogicPD LCD 10.4\" VGA"
|
||||
help
|
||||
This is an implementation of the Sharp LQ10D368, a 10.4"
|
||||
color VGA, TFT panel. The LogicPD device includes an
|
||||
The native resolution is 640x480.
|
||||
|
||||
|
||||
config FB_ARMCLCD_SHARP_LQ121S1DG41
|
||||
bool "LogicPD LCD 12.1\" SVGA"
|
||||
help
|
||||
This is an implementation of the Sharp LQ121S1DG41, a 12.1"
|
||||
color SVGA, TFT panel. The LogicPD device includes an
|
||||
The native resolution is 800x600.
|
||||
|
||||
This panel requires a clock rate may be an integer fraction
|
||||
of the base LCDCLK frequency. The driver will select the
|
||||
highest frequency available that is lower than the maximum
|
||||
allowed. The panel may flicker if the clock rate is
|
||||
slower than the recommended minimum.
|
||||
|
||||
config FB_ARMCLCD_AUO_A070VW01_WIDE
|
||||
bool "AU Optronics A070VW01 LCD 7.0\" WIDE"
|
||||
help
|
||||
This is an implementation of the AU Optronics, a 7.0"
|
||||
WIDE Color. The native resolution is 234x480.
|
||||
|
||||
config FB_ARMCLCD_HITACHI
|
||||
bool "Hitachi Wide Screen 800x480"
|
||||
help
|
||||
This is an implementation of the Hitachi 800x480.
|
||||
|
||||
endchoice
|
||||
|
||||
|
||||
config FB_ACORN
|
||||
bool "Acorn VIDC support"
|
||||
depends on (FB = y) && ARM && ARCH_ACORN
|
||||
|
|
|
|||
Loading…
Reference in a new issue